From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Feb 2011 17:50:03 +0000 (-0400)
Subject: Merge remote branch 'smcv/ready/transient-aggregate'
X-Git-Tag: 3.20110225~81
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3d7147992ab24d953c87b91f75851ca45895073c?ds=inline;hp=3d7147992ab24d953c87b91f75851ca45895073c

Merge remote branch 'smcv/ready/transient-aggregate'
---