From: Joey Hess Date: Tue, 25 Jan 2011 19:01:02 +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=313b06878c2e330848b4db6e12921366d93706c2;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 313b06878c2e330848b4db6e12921366d93706c2