Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  piatti to squeeze
  I can't believe that has ever worked

diff --combined config/nagios-master.cfg
index 366839f,5e2090c..4112a46
--- 1/config/nagios-master.cfg
--- 2/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@@ -646,7 -646,7 +646,7 @@@ servers
    piatti:
      address: 193.167.161.225
      parents: gw-helsinki
-     hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service
+     hostgroups: computers, dl385, acpid-hosts, apache2-hosts, hasbootfs, incomingmailrelayed2025, hasorgfs, service, squeeze
      contacts: holger
  
    rem:
@@@ -795,11 -795,6 +795,11 @@@
      parents: gw-ynic
      hostgroups: computers, buildd, sw-raid, hassrvfs
  
 +  santoro:
 +    addresses: 200.17.202.197
 +    parents: tchaikovsky
 +    hostgroups: computers, service, apache2-hosts, ftpd-hosts, rsyncd-hosts, xinetd-hosts, hassrvfs, squeeze
 +
  #############################
  # host groups
  #