From: Joey Hess <joey@kitenet.net>
Date: Sat, 24 Jul 2010 21:34:19 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100804~21
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/cba6935f55f95b99a177d2cbe9130d6d589e10a8

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

cba6935f55f95b99a177d2cbe9130d6d589e10a8