Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Fri, 18 Mar 2011 08:52:27 +0000 (09:52 +0100)
committerPeter Palfrader <peter@palfrader.org>
Fri, 18 Mar 2011 08:52:27 +0000 (09:52 +0100)
commit21994679ad2f2d01c0e438f80751c386933cba13
treebcc983c6c624daa29ab99165687538458e21a207
parentb811c2e85966512f45f336ce2db942e4cc00d36d
parent63b471479d341548350a680e245cdc3e21a7d861
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  alkman -> squeeze Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  englund -> squeeze Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
config/nagios-master.cfg