From: Joey Hess Date: Thu, 1 Sep 2011 15:38:46 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ad22a39cfe57d6ed1e80434276c7c77dcbd217c7;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- ad22a39cfe57d6ed1e80434276c7c77dcbd217c7