From: Joey Hess Date: Wed, 25 Aug 2010 18:58:06 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100831~49 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=43aed8e2d769bb26c12a7e813053ff3f3f9b30f5;p=ikiwiki.git Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- 43aed8e2d769bb26c12a7e813053ff3f3f9b30f5