From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Feb 2011 17:42:15 +0000 (-0400)
Subject: Merge remote branch 'smcv/ready/transient'
X-Git-Tag: 3.20110225~84
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/acd10522980712a91b8a801e974240ff90af829e?hp=acd10522980712a91b8a801e974240ff90af829e

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