From: Joey Hess Date: Wed, 9 Feb 2011 19:52:46 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=78e0eea5e7fd38903d6a80c9453275a7e074427e;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 78e0eea5e7fd38903d6a80c9453275a7e074427e