Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Fri, 5 Mar 2010 15:32:11 +0000 (16:32 +0100)
committerPeter Palfrader <peter@palfrader.org>
Fri, 5 Mar 2010 15:32:11 +0000 (16:32 +0100)
commit2bd3cb314556a83f6c541aac1257c1e42f3b8494
tree5403d3b8c4dabd372073e90bcebca2687fae05e2
parentda44ea1ef1b428e42bdbe15b8eff05fbe8d75770
parent78f00d6031f1aca3af47e028fe4bde551979fc93
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  I don't think gw-cst has the same ip as escher
config/nagios-master.cfg