From: Joey Hess Date: Sun, 1 Mar 2009 20:07:14 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.06~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7e63896057ddeb5ce5986fc7c7bf88b99324be7;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- b7e63896057ddeb5ce5986fc7c7bf88b99324be7