From: Joey Hess Date: Sun, 27 Jun 2010 17:50:02 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100704~24 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=be60d261e6cbee094e4df74e1bb24c8ad3dc393d;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- be60d261e6cbee094e4df74e1bb24c8ad3dc393d