From: Joey Hess Date: Thu, 3 Nov 2011 17:06:09 +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=7cdbc9642f6576fd3f20aff45843890202291843 Merge branch 'master' of ssh://git.ikiwiki.info --- 7cdbc9642f6576fd3f20aff45843890202291843