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=--cc

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

Conflicts:
	.ssh/config.in
---

dc07e6c5c6245f67b1add9b5eb3596f01e41968b
diff --cc .ssh/config.in
index 2fcb4db,f93c263..67ff7e7
--- a/.ssh/config.in
+++ b/.ssh/config.in
@@@ -91,13 -92,9 +92,17 @@@ Host madduck.ne
  Host imap.madduck.net
    HostKeyAlias seamus.madduck.net
  
- Host bell.madduck.net | bell
++Host diamond.madduck.net | diamond
 +  ForwardAgent yes
++<<<<<<< HEAD
 +  Hostname bell.madduck.net
 +
  Host diamond.madduck.net | diamond
    ForwardAgent yes
    Hostname diamond.madduck.net
++Host scratch.madduck.net | scratch
++  User madduck
++  HostKeyAlias diamond.madduck.net
  Host tunes.madduck.net | tunes
    AddressFamily inet
    ControlMaster no