From: Joey Hess Date: Sun, 3 Jun 2012 17:17:03 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6622d913dd0ca91f35eae1c9ca1e5b764112514f;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 6622d913dd0ca91f35eae1c9ca1e5b764112514f