From: Joey Hess <joey@kitenet.net>
Date: Sun, 23 Feb 2014 18:05:36 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140227~28
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/278036ef45c30cccf4e30cbb899521bdc4ebb202?ds=inline;hp=--cc

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

278036ef45c30cccf4e30cbb899521bdc4ebb202