From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 21 Oct 2009 17:51:01 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091022~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ba682e0f9a55ffd74584aa3b8abb0087c7762317

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

ba682e0f9a55ffd74584aa3b8abb0087c7762317