From: Joey Hess <joey@kitenet.net>
Date: Mon, 17 May 2010 17:13:43 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100518~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/92fa3f63d474a98e5f734c0cad432c9f3136c31c

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

92fa3f63d474a98e5f734c0cad432c9f3136c31c