From: Joey Hess Date: Wed, 9 Feb 2011 17:50:03 +0000 (-0400) Subject: Merge remote branch 'smcv/ready/transient-aggregate' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d7147992ab24d953c87b91f75851ca45895073c;p=ikiwiki.git Merge remote branch 'smcv/ready/transient-aggregate' --- 3d7147992ab24d953c87b91f75851ca45895073c