From: Simon McVittie <smcv@carbon.pseudorandom.co.uk>
Date: Mon, 14 Jul 2008 21:22:39 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ikiwiki.info
X-Git-Tag: 2.54~87^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a65d312467c5ab179ecf4aa715790f371a46634a;p=ikiwiki.git

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

a65d312467c5ab179ecf4aa715790f371a46634a