From: Joey Hess <joey@kitenet.net>
Date: Wed, 24 Aug 2011 19:51:28 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110905~34
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/e92f292525c615daf98c3bcf6a10a252bc77ebaa

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

e92f292525c615daf98c3bcf6a10a252bc77ebaa