Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Sat, 27 Mar 2010 15:25:25 +0000 (16:25 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sat, 27 Mar 2010 15:25:25 +0000 (16:25 +0100)
commit8bb0420d088d6bee060724e44b68abe2cf47722f
tree7137b1ed45580e124c182ac2a7b01268c70ee153
parentb00a6512f1451c286f67b6aafb0a17648eb7a588
parent22e9882623fc2f9829116e7c23d4c22f2ebb97b5
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  grieg has postgres
  corelli has ulogd
  add corelli
config/nagios-master.cfg