From: Joey Hess <joey@gnu.kitenet.net>
Date: Thu, 25 Mar 2010 18:30:58 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100403~98
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b19fb349f57e7dd9914aae728c5243dc6640026f

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

b19fb349f57e7dd9914aae728c5243dc6640026f