From: Joey Hess <joey@kitenet.net>
Date: Tue, 8 Oct 2013 13:51:41 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140102~80
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/65b8fba17c444864135f5f19aeb42d928ca0b120

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

65b8fba17c444864135f5f19aeb42d928ca0b120