From: Simon McVittie <http://smcv.pseudorandom.co.uk/>
Date: Sat, 12 Jul 2008 21:56:55 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ikiwiki.info into bugs
X-Git-Tag: 2.54~70^2~17
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ac8a862a06d295ea34b392f56682bc18a85d8495

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

ac8a862a06d295ea34b392f56682bc18a85d8495