From: Joey Hess <joey@gnu.kitenet.net>
Date: Mon, 15 Feb 2010 00:11:35 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100302~32
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8805d6fff22878497cc72d69509b2008e77bd20d

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

8805d6fff22878497cc72d69509b2008e77bd20d