From: Joey Hess <joey@kitenet.net>
Date: Tue, 23 Aug 2011 17:09:35 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20110905~35
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/26d9a24fde920429add603b9d893787c41903477?hp=--cc

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

26d9a24fde920429add603b9d893787c41903477