From: Joey Hess <joey@kitenet.net>
Date: Thu, 5 Apr 2012 16:22:41 +0000 (-0400)
Subject: Merge remote-tracking branch 'smcv/trail'
X-Git-Tag: 3.20120419~64
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c3d5775757e334e167beed98af01d4e3b2396dd2

Merge remote-tracking branch 'smcv/trail'
---

c3d5775757e334e167beed98af01d4e3b2396dd2