From: Joey Hess Date: Tue, 22 May 2012 19:21:17 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=7f8706dfdb35e28bf81857dba01541c2958f62a6 Merge branch 'master' of ssh://git.ikiwiki.info --- 7f8706dfdb35e28bf81857dba01541c2958f62a6