From: martin f. krafft Date: Sun, 1 Mar 2009 17:37:53 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh X-Git-Url: https://git.madduck.net/etc/ssh.git/commitdiff_plain/b439e12e4052a3abf4f07e3dbee94982bece06ba?hp=2fd6dbc5649ea33262a17a1d4ce81133df234c1e Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/ssh --- diff --git a/.ssh/config.in b/.ssh/config.in index 40aa48f..d25f952 100644 --- a/.ssh/config.in +++ b/.ssh/config.in @@ -107,7 +107,6 @@ Host pict.oerlikon.madduck.net | pict # AddressFamily inet Host lust.oerlikon.madduck.net | lust | hermia - AddressFamily inet HostKeyAlias hermia.mjollnir.org ForwardX11 yes CheckHostIP no