From: Joey Hess <joey@kitenet.net>
Date: Wed, 26 Jun 2013 15:21:35 +0000 (-0400)
Subject: Merge remote-tracking branch 'smcv/ready/no-trails-if-dynamic'
X-Git-Tag: 3.20130710~27
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/428d4065532f5c98aae362059c73d2cdec0ed541

Merge remote-tracking branch 'smcv/ready/no-trails-if-dynamic'
---

428d4065532f5c98aae362059c73d2cdec0ed541