From: Joey Hess Date: Wed, 2 Jan 2013 19:31:10 +0000 (-0400) Subject: Merge remote-tracking branch 'smcv/ready/trail' X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=22cb87c6849dd2baf0c944f1d546f4318e67b325 Merge remote-tracking branch 'smcv/ready/trail' --- 22cb87c6849dd2baf0c944f1d546f4318e67b325