From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Nov 2011 16:15:39 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111107~11
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2615b92fd43e588bc401d328a1fbf8435e028528?hp=-c

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

2615b92fd43e588bc401d328a1fbf8435e028528