From: Simon McVittie <http://smcv.pseudorandom.co.uk/>
Date: Sun, 13 Jul 2008 14:32:40 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 2.54~87^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=31bc223abbe0ec1990921b4bab85f074431b0c1d;p=ikiwiki.git

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

31bc223abbe0ec1990921b4bab85f074431b0c1d