From: Joey Hess Date: Wed, 30 Nov 2011 20:49:18 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f55931dd769c732cc50d4ca7df9293a28574bee0;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- f55931dd769c732cc50d4ca7df9293a28574bee0