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)
commite81705892bfdb242d5cb4cbc088243a190fdd319
treeb3da0a30dc25d0a90615ff6e94a07883a127d4b9
parenta0fff9b0763a200963a09157393b980b0746aa75
parent9d3789f3e8be3c441367d73c452eeb15dd685538
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  More services for bizet
config/nagios-master.cfg