From: Joey Hess Date: Wed, 9 Jun 2010 19:32:20 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100610~16 X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=2eefd84d0adbcaaaf4aa1c306a1c745fa52f3c9b Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 2eefd84d0adbcaaaf4aa1c306a1c745fa52f3c9b