From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 15 Jul 2008 00:08:09 +0000 (+0100)
Subject: Merge branch 'aggregateinternal'
X-Git-Tag: 2.54~87^2~3
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/6ebea774c85502377681165e27093a3bd3a61f30

Merge branch 'aggregateinternal'
---

6ebea774c85502377681165e27093a3bd3a61f30