From: Joey Hess <joey@kitenet.net>
Date: Tue, 14 Jan 2014 18:52:50 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140125~13
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4c3a2a135766ea18ffd24b4ae956dc0dc4a27380

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

4c3a2a135766ea18ffd24b4ae956dc0dc4a27380