From: Joey Hess Date: Thu, 5 Apr 2012 16:22:41 +0000 (-0400) Subject: Merge remote-tracking branch 'smcv/trail' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c3d5775757e334e167beed98af01d4e3b2396dd2;p=ikiwiki.git Merge remote-tracking branch 'smcv/trail' --- c3d5775757e334e167beed98af01d4e3b2396dd2