From: Joey Hess Date: Sun, 27 Nov 2011 17:20:53 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=9412876ffdc8bb868b310d9e07bd90867e3ca36b Merge branch 'master' of ssh://git.ikiwiki.info --- 9412876ffdc8bb868b310d9e07bd90867e3ca36b