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

Merge remote branch 'smcv/transient-relative-api'
---