From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 15 Jul 2008 00:27:17 +0000 (+0100)
Subject: Merge commit 'origin/master'
X-Git-Tag: 2.54~87^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2df8696b5f234095a89182e53279fb6c61258711;p=ikiwiki.git

Merge commit 'origin/master'
---

2df8696b5f234095a89182e53279fb6c61258711