From: Joey Hess Date: Wed, 18 Apr 2012 19:48:10 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=760df1da8297c6cff557d42c8b25bcfb86065425;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 760df1da8297c6cff557d42c8b25bcfb86065425