From: Joey Hess Date: Mon, 11 Oct 2010 15:41:40 +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=c321f5406b29e29b6ff61ab9e291a24d68e9d824;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- c321f5406b29e29b6ff61ab9e291a24d68e9d824