From: Joey Hess Date: Mon, 4 Oct 2010 21:03:21 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=082649f8698c5ca71aad504384f6aa4724420a8e;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 082649f8698c5ca71aad504384f6aa4724420a8e