From: Joey Hess Date: Thu, 29 Dec 2011 16:08:48 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bcd863df2a65629c2ebd011a5c3fae5d93627265;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- bcd863df2a65629c2ebd011a5c3fae5d93627265