From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 22 Jan 2009 04:04:48 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.03~52
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/7c00c46bcabccd38173faa6269f9faeaf4a56f76

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

7c00c46bcabccd38173faa6269f9faeaf4a56f76