From: Joey Hess Date: Sat, 11 Aug 2012 20:24:11 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44378db5a8593bbabe1974b4d37ab20c618135e7;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 44378db5a8593bbabe1974b4d37ab20c618135e7