From: martin f. krafft <madduck@madduck.net>
Date: Mon, 1 Aug 2011 15:37:15 +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/a3db3e8871508ddbdb04c679522fe359bd901e72?ds=sidebyside

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

Conflicts:
	.ssh/known_hosts.d/debian.org
---

a3db3e8871508ddbdb04c679522fe359bd901e72