From: Joey Hess Date: Tue, 7 Sep 2010 20:00:59 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100915~45 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=75cbdab57e524075f0ccc51d103bf63beef62109;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 75cbdab57e524075f0ccc51d103bf63beef62109