From: Joey Hess <joey@kitenet.net>
Date: Wed, 18 Apr 2012 19:45:37 +0000 (-0400)
Subject: Merge remote-tracking branch 'smcv/ready/trail'
X-Git-Tag: 3.20120419~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ae083783dfdaac05ec6b089771ed159f9246889c

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

ae083783dfdaac05ec6b089771ed159f9246889c