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)
commit05dd2fd61cc7408181691d8bd6f378358a727520
tree5c8fb06f810c69e656dd88b12371568d3c5154ab
parent0f637373550469d8cdfe1ed8b928ae6392847b70
parent66d34436a1aebd6e916079095c5b73239f148163
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  ulogd does not work on sparc64, #265985
config/nagios-master.cfg