From: Joey Hess Date: Sat, 27 Feb 2010 21:37:10 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100302~15 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=70972b16874583bb642b093fb9906a0967d69ac3;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 70972b16874583bb642b093fb9906a0967d69ac3