From: Simon McVittie <http://smcv.pseudorandom.co.uk/>
Date: Sat, 12 Jul 2008 21:44:36 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/f59d7f1e9b3851dd86acf9d46096ca8de6fad540

Merge branch 'master' of git://git.ikiwiki.info
---

f59d7f1e9b3851dd86acf9d46096ca8de6fad540