From: Joey Hess Date: Thu, 20 Dec 2012 23:33:48 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23791480f00d7f3faf3531b861b41a5471677451;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 23791480f00d7f3faf3531b861b41a5471677451