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

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

693a0f1ef2c1a920602191fb3226d6378b1012e8