From: Joey Hess Date: Fri, 10 Sep 2010 21:17:23 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100915~32 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4c5cf30ff9cc1a7f88a973afcc7c6d838ae578b0;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 4c5cf30ff9cc1a7f88a973afcc7c6d838ae578b0