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)
commit5410d83bb5d20703ee786d2737a02542f7e64aa1
tree2fcdeb4ae580aeae7e87464946b0affe738c243b
parentcff6340a3a73a1f84e3ea1cab32cd27ece00f311
parentc3117d289e64ab0e3aff5e3969d59ba41d5614cf
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  Decommission goetz and albeniz (RT#3693; RT#3692)
  high-RTT hostgroup
config/nagios-master.cfg