From: Joey Hess <joey@kitenet.net>
Date: Tue, 30 Aug 2011 15:38:30 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110905~20
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2c2c537dd521bbc659f0499af72ca70078d97d50

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

2c2c537dd521bbc659f0499af72ca70078d97d50