]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'aggregateinternal'
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 01:05:25 +0000 (02:05 +0100)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 01:05:25 +0000 (02:05 +0100)

Trivial merge