Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 19:09:14 +0000 (20:09 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 19:09:14 +0000 (20:09 +0100)
commit112f7888237d00bdf10bb70935f1b162d8f87568
treea639ce8c17a158b09d59a463662cbbf4b65c3dd7
parent7d3a9796a3c0644550a690eb964bfa3122dfc8c3
parentb4299747dd480e2fdbf1b9c760226e447dcd985d
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  now geo1 has ulog
config/nagios-master.cfg