From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Mon, 14 Jul 2008 23:02:15 +0000 (+0100)
Subject: Merge branch 'aggregateinternal'
X-Git-Tag: 2.54~87^2~4
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e95d3bb4fd1ea131a78b09ca2710df642f74c003

Merge branch 'aggregateinternal'
---

e95d3bb4fd1ea131a78b09ca2710df642f74c003