From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 12 Mar 2010 20:21:07 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100403~184
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0b4261c4587ae76057c14f3fa8c241292dd2b302

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

0b4261c4587ae76057c14f3fa8c241292dd2b302