From: Joey Hess <joey@kitenet.net>
Date: Wed, 29 Jun 2011 18:43:51 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110707~29
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/631c0d9e7c3892abb79bcb31b5769390846a07c3

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

631c0d9e7c3892abb79bcb31b5769390846a07c3