From: Joey Hess <joey@kitenet.net>
Date: Mon, 28 Mar 2011 17:09:14 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110430~131
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/116672d7d72d8181607f69ad22ad8bd0bb9d8348?hp=116672d7d72d8181607f69ad22ad8bd0bb9d8348

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