From: Joey Hess <joey@kitenet.net>
Date: Thu, 11 Oct 2012 15:22:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20121016~7
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/ef0c569a956f97ee02df16c1a3e8f3cb2993a62a

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

ef0c569a956f97ee02df16c1a3e8f3cb2993a62a