From: Joey Hess Date: Sun, 15 Jan 2012 20:28:51 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d356fdf8b826ac564d8e04d32785367f53e4556;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info --- 1d356fdf8b826ac564d8e04d32785367f53e4556