Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Tue, 27 Mar 2012 14:37:58 +0000 (16:37 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Tue, 27 Mar 2012 14:37:58 +0000 (16:37 +0200)
* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  Decommission goetz and albeniz (RT#3693; RT#3692)
  high-RTT hostgroup

1  2 
config/nagios-master.cfg

Simple merge