From: Joey Hess Date: Thu, 16 Dec 2010 18:14:00 +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=06f4532f3832924d28da535c2caccd6858d15018;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 06f4532f3832924d28da535c2caccd6858d15018