From: Joey Hess Date: Sat, 25 Aug 2012 14:56:30 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4ef13d9856d0d61d87afadcfd7ec20d4e0cb646c;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 4ef13d9856d0d61d87afadcfd7ec20d4e0cb646c