From: Joey Hess Date: Sat, 25 Aug 2012 14:43:37 +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=5fa605beada972eb32ca781ee420cc69e1732e20 Merge branch 'master' of ssh://git.ikiwiki.info --- 5fa605beada972eb32ca781ee420cc69e1732e20