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

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

4035c7f396edac2b4e4b6e344b12fb014542fd08