From: Joey Hess Date: Fri, 8 Oct 2010 23:32:20 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=726270ad0017cfd1d1c36e9a765eb0638bec86f6 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 726270ad0017cfd1d1c36e9a765eb0638bec86f6