]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'aggregateinternal'
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 00:08:09 +0000 (01:08 +0100)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 00:08:09 +0000 (01:08 +0100)

Trivial merge