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

Trivial merge