From: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Date: Tue, 15 Jul 2008 01:05:25 +0000 (+0100)
Subject: Merge branch 'aggregateinternal'
X-Git-Tag: 2.54~87^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d3008b626ea6130d3b75662725f6f2c412fc71ea;p=ikiwiki.git

Merge branch 'aggregateinternal'
---

d3008b626ea6130d3b75662725f6f2c412fc71ea