From: Joey Hess Date: Fri, 3 Jun 2011 17:05:30 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ee4e6362443e0ca36a552995bd89f8b57cf32562;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- ee4e6362443e0ca36a552995bd89f8b57cf32562