]> sipb.mit.edu Git - ikiwiki.git/commit
Merge commit 'smcv/aggregateinternal' into aggregateinternal
authorJoey Hess <joey@kodama.kitenet.net>
Tue, 15 Jul 2008 00:15:08 +0000 (20:15 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Tue, 15 Jul 2008 00:15:08 +0000 (20:15 -0400)
commitaf48316b1d3a54cde1524d47773346f4cd39cb37
tree1217b743eda079bbbf031342a31d320de480cbea
parent3ebb012e3fbb456a322ff546b9ec222050d5cf49
parent302bb836f298c462da8e8bff7b04f1b00ded4665
Merge commit 'smcv/aggregateinternal' into aggregateinternal

Conflicts:

IkiWiki/Plugin/aggregate.pm
IkiWiki/Plugin/aggregate.pm