From: Joey Hess Date: Wed, 18 Apr 2012 19:45:37 +0000 (-0400) Subject: Merge remote-tracking branch 'smcv/ready/trail' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ae083783dfdaac05ec6b089771ed159f9246889c;p=ikiwiki.git Merge remote-tracking branch 'smcv/ready/trail' --- ae083783dfdaac05ec6b089771ed159f9246889c