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