From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 17:34:45 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100623~60
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d3d63817c8ba2066ff942823baafa94b44a4e9af?hp=d3d63817c8ba2066ff942823baafa94b44a4e9af

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---