From: Joey Hess <joey@gnu.kitenet.net>
Date: Tue, 17 Nov 2009 21:18:26 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20091202~46
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/6fe2ec0f5c3d9fe5780385c17aaf7370fe8efc24

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

6fe2ec0f5c3d9fe5780385c17aaf7370fe8efc24