From: Joey Hess Date: Fri, 21 Dec 2012 18:47:46 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c357692b3407278056204c0931b596fd212305d0;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- c357692b3407278056204c0931b596fd212305d0