From: Joey Hess Date: Thu, 20 Dec 2012 19:28:28 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4f274e04544d5cb25f693e3590d32e181a13ea9e;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 4f274e04544d5cb25f693e3590d32e181a13ea9e