From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 7 Apr 2010 02:59:57 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100427~207
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f2a87addc63114edd3e096cff286bc3b19989df3

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

f2a87addc63114edd3e096cff286bc3b19989df3