From: Joey Hess Date: Thu, 9 Sep 2010 22:23:40 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100915~41 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=57f9dd2e1aecfa718899f0626d1da1fef9eead49;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 57f9dd2e1aecfa718899f0626d1da1fef9eead49