From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 15 Jul 2008 00:15:08 +0000 (-0400)
Subject: Merge commit 'smcv/aggregateinternal' into aggregateinternal
X-Git-Tag: 2.54~95
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/af48316b1d3a54cde1524d47773346f4cd39cb37?ds=sidebyside;hp=af48316b1d3a54cde1524d47773346f4cd39cb37

Merge commit 'smcv/aggregateinternal' into aggregateinternal

Conflicts:

	IkiWiki/Plugin/aggregate.pm
---