From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 25 Nov 2009 22:19:43 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091202~35
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c6db2d376b5eb199999d6be41e6af6dcec6074ba

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

c6db2d376b5eb199999d6be41e6af6dcec6074ba