From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Apr 2010 03:05:04 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100427~204
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/9dc220711dff12fd45274c4e2fd2645a33d3de5c

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

9dc220711dff12fd45274c4e2fd2645a33d3de5c