From: Joey Hess <joey@kitenet.net>
Date: Wed, 23 Nov 2011 20:06:58 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20111107~56
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d36d4c4ce5acc44780a4dbcc95a1d2bceee8caa2

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

d36d4c4ce5acc44780a4dbcc95a1d2bceee8caa2