From: Simon McVittie <smcv@carbon.pseudorandom.co.uk>
Date: Mon, 14 Jul 2008 22:34:07 +0000 (+0100)
Subject: Merge commit 'origin/master' into aggregateinternal
X-Git-Tag: 2.54~99
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/18b3e970ffcc0f74d68538b7094f76442a294609

Merge commit 'origin/master' into aggregateinternal
---

18b3e970ffcc0f74d68538b7094f76442a294609