From: Joey Hess <joey@kitenet.net>
Date: Thu, 19 Jul 2012 17:48:56 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120725~66
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/56de5b2d89e38309c9152a0e98a3c65453c8009e

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

56de5b2d89e38309c9152a0e98a3c65453c8009e