From: Joey Hess Date: Thu, 15 Dec 2011 18:05:07 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=95ea0d7e54e84f01aa8d1cb590769ff8d806f987;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 95ea0d7e54e84f01aa8d1cb590769ff8d806f987