From: Joey Hess <joey@kitenet.net>
Date: Fri, 30 Apr 2010 18:10:17 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100501~22
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/3e6cbc319094fa088c873071cabf7b7bf7add0eb

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

3e6cbc319094fa088c873071cabf7b7bf7add0eb