From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 20 Jan 2009 16:12:17 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.03~60
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a9585d231e7bd57bb4da2e962198e59bbbb3d2d1?hp=-c

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

a9585d231e7bd57bb4da2e962198e59bbbb3d2d1