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

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

9fc13ab196f9ac9852962365d3330020d6720b0b