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)
commit1cf18b727908edcb74098b6db87b81d52f6aba14
tree15c7b0622923ff0a6c8644496b1202e389195fc1
parentba41213d86fa3d26a0ee0505bb7d72dcfe3d6559
parent0e01da8e5b000dd0e7c9b5950b89d04a3c8f8890
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  bartok now has ulogd