From: Joey Hess Date: Sun, 5 Dec 2010 20:38:44 +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=38d7e71c654f27cd2691537742e84b8113f1ad3c Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 38d7e71c654f27cd2691537742e84b8113f1ad3c