From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 24 Nov 2009 02:53:07 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091202~41
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c6daf3b022390f0b45c60885c50e2f19fde966d3

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

c6daf3b022390f0b45c60885c50e2f19fde966d3