From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 13 Feb 2010 19:08:06 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100302~37
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/407dff979ce253ca912ddd0869794e7402c32901

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

407dff979ce253ca912ddd0869794e7402c32901