From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Mar 2011 14:36:46 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20110430~128
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/080a4cb57947a7991ea5781342af5756ed7213ae

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

080a4cb57947a7991ea5781342af5756ed7213ae