From: Joey Hess <joey@kitenet.net>
Date: Wed, 10 Oct 2012 14:45:38 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20121016~9
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/2eb11762169bd8f1d5ee52020159bd4e2215ed4f

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

2eb11762169bd8f1d5ee52020159bd4e2215ed4f