From: Joey Hess Date: Wed, 2 Mar 2011 16:40:57 +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=899b8c80a08ef4bf4ebc177045e86859fbef554f;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 899b8c80a08ef4bf4ebc177045e86859fbef554f