]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of git://git.ikiwiki.info
authorSimon McVittie <smcv@carbon.pseudorandom.co.uk>
Mon, 14 Jul 2008 21:22:39 +0000 (22:22 +0100)
committerSimon McVittie <smcv@carbon.pseudorandom.co.uk>
Mon, 14 Jul 2008 21:22:39 +0000 (22:22 +0100)
1  2 
IkiWiki/Plugin/aggregate.pm

Simple merge