From: Joey Hess Date: Fri, 9 Dec 2011 17:18:50 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8eec88bd7ccd4b900e96bc2db0c29224dcf5399b;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 8eec88bd7ccd4b900e96bc2db0c29224dcf5399b