From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 15 Jul 2008 00:00:18 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ikiwiki.info into aggregateinternal
X-Git-Tag: 2.54~95^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e54af6e0a5e9e45a1e88d7b6aac4283e974d0258;p=ikiwiki.git

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

e54af6e0a5e9e45a1e88d7b6aac4283e974d0258