From: Joey Hess Date: Mon, 13 Sep 2010 21:11:33 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100915~11 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d7cd669470a5c8a920032baac6665bfc8eb4bd5b;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- d7cd669470a5c8a920032baac6665bfc8eb4bd5b