From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 20:34:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100427~81
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f03d3d8567cd49a231b74af44251e775bf6321c5

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

f03d3d8567cd49a231b74af44251e775bf6321c5