From: Simon McVittie <http://smcv.pseudorandom.co.uk/>
Date: Sat, 12 Jul 2008 22:01:42 +0000 (+0100)
Subject: Merge branch 'bugs'
X-Git-Tag: 2.54~87^2~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e41e96f8325aa4ada5b37b79812c47a8737b753c;p=ikiwiki.git

Merge branch 'bugs'
---

e41e96f8325aa4ada5b37b79812c47a8737b753c