From: Joey Hess <joey@kitenet.net>
Date: Mon, 18 Nov 2013 20:37:58 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: debian/3.20140102~52
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/00629adcea2fcbfc2e9a5e9bd0def6731ab6ef1c?hp=00629adcea2fcbfc2e9a5e9bd0def6731ab6ef1c

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