From: Joey Hess Date: Sat, 26 Feb 2011 00:12:09 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4d1942d1ba73e39fd246cee6579f2d788ed2a0af;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 4d1942d1ba73e39fd246cee6579f2d788ed2a0af