From: Joey Hess Date: Sat, 2 Jun 2012 01:32:51 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa9c867061dd11022853aaef711452aee80905f5;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- aa9c867061dd11022853aaef711452aee80905f5