Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Fri, 23 Apr 2010 17:21:15 +0000 (19:21 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 23 Apr 2010 17:21:15 +0000 (19:21 +0200)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  ulogd does not work on sparc64, #265985

1  2 
config/nagios-master.cfg

Simple merge