From: Simon McVittie <http://smcv.pseudorandom.co.uk/>
Date: Sat, 12 Jul 2008 21:53:25 +0000 (+0100)
Subject: Merge branch 'bugs'
X-Git-Tag: 2.54~87^2~9
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5fe26d6bfc6b5153b2ab97bfffb3c57257feddd6

Merge branch 'bugs'
---

5fe26d6bfc6b5153b2ab97bfffb3c57257feddd6