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

Trivial merge