From: martin f. krafft <madduck@madduck.net>
Date: Thu, 27 Oct 2011 19:21:02 +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/dc07e6c5c6245f67b1add9b5eb3596f01e41968b?ds=sidebyside;hp=dc07e6c5c6245f67b1add9b5eb3596f01e41968b

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

Conflicts:
	.ssh/config.in
---