From: Joey Hess <joey@kitenet.net>
Date: Mon, 18 Apr 2011 00:59:28 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110430~35
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/331430fe9f092cd00db316a1b35c5fe8b42d036d

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

331430fe9f092cd00db316a1b35c5fe8b42d036d