From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 15 Oct 2009 18:26:22 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091017~21
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8d26a4267568451de286a9e6a4a73edf8e99e084

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

8d26a4267568451de286a9e6a4a73edf8e99e084