From: Joey Hess <joey@kitenet.net>
Date: Mon, 19 Mar 2012 15:19:41 +0000 (-0400)
Subject: Merge remote-tracking branch 'smcv/trail-test'
X-Git-Tag: 3.20120203~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9f2a2879c8225862e993348c133b5a493e74f3e9

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

9f2a2879c8225862e993348c133b5a493e74f3e9