From: Joey Hess <joey@kitenet.net>
Date: Sat, 30 Apr 2011 20:31:36 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110430~9
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5885551e82f3c1927590a82ac5fb53e114ecc863?ds=sidebyside;hp=5885551e82f3c1927590a82ac5fb53e114ecc863

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