From: Joey Hess <joey@kitenet.net>
Date: Sun, 2 May 2010 19:45:48 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100504~33
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/cbe0726b6345bceed3ebc7fbd5ea2454dce63b15

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

cbe0726b6345bceed3ebc7fbd5ea2454dce63b15