From: Joey Hess <joey@kitenet.net>
Date: Wed, 2 Oct 2013 17:26:42 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140102~83
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/1b64f369e3edc1b4e185c33380a8bbf88a41715a?hp=--cc

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

1b64f369e3edc1b4e185c33380a8bbf88a41715a