From: Joey Hess <joey@kitenet.net>
Date: Mon, 21 Mar 2011 17:47:12 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110321~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/14b8abe60f02a9a31eb4b7ad489e6806637610f7

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

14b8abe60f02a9a31eb4b7ad489e6806637610f7