From: Joey Hess Date: Wed, 14 Sep 2011 15:09:24 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=225a557b10de7ddf0ad1706326db7dfc2ed703e3;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 225a557b10de7ddf0ad1706326db7dfc2ed703e3