Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Sun, 28 Feb 2010 16:00:43 +0000 (17:00 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 28 Feb 2010 16:00:43 +0000 (17:00 +0100)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  bartok now has ulogd


Trivial merge