From: martin f. krafft <madduck@madduck.net>
Date: Mon, 17 Feb 2014 20:33:45 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/ssh
X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/4a00cd9a85291b97ba4e5ddf985a9904efdf5546?ds=inline;hp=--cc;pf=etc

Merge branch 'master' of ssh://git.madduck.net/madduck/pub/etc/ssh
---

4a00cd9a85291b97ba4e5ddf985a9904efdf5546