From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Fri, 28 Aug 2009 14:55:28 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Tag: 3.1415926~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a3f4077c3667898ec39acbd6e25c04e82e98c0b2;p=ikiwiki.git

Merge commit 'origin/master'
---

a3f4077c3667898ec39acbd6e25c04e82e98c0b2