From: martin f. krafft <madduck@madduck.net>
Date: Mon, 16 Sep 2013 13:23:44 +0000 (+0200)
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/f1370a797cf7f777c353701a3338e5f96db67cbd?hp=f1370a797cf7f777c353701a3338e5f96db67cbd

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

Conflicts:
	.ssh/known_hosts.d/gern.madduck.net
---