From: Joey Hess <joey@kitenet.net>
Date: Wed, 7 Jul 2010 17:58:19 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100722~69
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/8ce11b51f85a08e6dd426b3855b06e5e3ce09f55?hp=8ce11b51f85a08e6dd426b3855b06e5e3ce09f55

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