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

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

c6c7e1998669f4979a2f12bbdd6d74775d5946d2