From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 14 Aug 2009 17:06:19 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.1415926~130
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a4ad193d464d1e44c8968bff98479fde35f9e60f

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

a4ad193d464d1e44c8968bff98479fde35f9e60f