From: Joey Hess <joey@kitenet.net>
Date: Mon, 13 Jun 2011 16:50:26 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110707~75
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/38dd85c7994049e4594df1f395ca7bde3dee8895

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

38dd85c7994049e4594df1f395ca7bde3dee8895