Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Wed, 16 Mar 2011 14:08:07 +0000 (15:08 +0100)
committerPeter Palfrader <peter@palfrader.org>
Wed, 16 Mar 2011 14:08:07 +0000 (15:08 +0100)
commita02d0ed1250b6c824c10578f76951c7a94ed89a6
tree671155a1245427f6527726434ced77ba35a8e3e5
parent6cd4570e23487bb8b60e907cd503b55c98ce4c81
parent6fdbb2f90e6a9a8548dfef9aeb80aec3c6c9601b
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  heininen -> squeeze Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
  luca updated his email address
  lindeberg to squeeze
  duarte to squeeze
  some more machines to squeeze
config/nagios-master.cfg