Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Mon, 21 Mar 2011 19:14:27 +0000 (20:14 +0100)
committerPeter Palfrader <peter@palfrader.org>
Mon, 21 Mar 2011 19:14:27 +0000 (20:14 +0100)
commitadb6cfe3e5db6f3b20ec157d276604cd629811ab
tree9187068c9a583fad6a23f360be3cac66b4e8e6b9
parentebad1aa69153d7350f10515ac5850967dc1aaae7
parent0723a8bf925da19ae9f7cfe3f6534ae582745550
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  franck going to squeeze

Conflicts:
config/nagios-master.cfg