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