From: Joey Hess Date: Sat, 25 Aug 2012 03:00:35 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3da366b44bb4a8e5c863e91adbc93158bc548e60;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 3da366b44bb4a8e5c863e91adbc93158bc548e60