From: Joey Hess <joey@gnu.kitenet.net>
Date: Sun, 27 Sep 2009 22:34:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091009~99
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1a366910d30a0ff07a16f3d0505e0584a63a465a

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

1a366910d30a0ff07a16f3d0505e0584a63a465a