From: Joey Hess Date: Tue, 20 Apr 2010 02:37:02 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100427~104 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8f8bda1ae55632de4221859abd082ffe61c4a07d;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 8f8bda1ae55632de4221859abd082ffe61c4a07d