Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 19 Feb 2012 13:14:45 +0000 (14:14 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 19 Feb 2012 13:14:45 +0000 (14:14 +0100)
* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  More services for bizet

1  2 
config/nagios-master.cfg

Simple merge