From: Joey Hess Date: Fri, 18 Jun 2010 22:07:40 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100623~27 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9b673c2afc815185bad1bc35edaffeff115dd1b3;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 9b673c2afc815185bad1bc35edaffeff115dd1b3