From: Joey Hess Date: Sat, 8 May 2010 23:42:20 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100515~44 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a380fa0e6b3e18db86eb00ab235abfc75581a11d;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- a380fa0e6b3e18db86eb00ab235abfc75581a11d