From: Simon McVittie <http://smcv.pseudorandom.co.uk/>
Date: Sat, 12 Jul 2008 18:01:56 +0000 (+0100)
Subject: Merge branch 'master' of git://git.ikiwiki.info into aggregateinternal
X-Git-Tag: 2.54~100
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/23a3de5e8c4998c41afc99664fd4a7fe25e7bf29

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

23a3de5e8c4998c41afc99664fd4a7fe25e7bf29