From: Joey Hess Date: Wed, 21 Apr 2010 20:14:23 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100427~84 X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=e9551afc5f2e5a5e8ef28f5e68d5159692cba9dc Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- e9551afc5f2e5a5e8ef28f5e68d5159692cba9dc