From: Peter Palfrader Date: Sun, 28 Feb 2010 16:00:43 +0000 (+0100) Subject: Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=1cf18b727908edcb74098b6db87b81d52f6aba14;p=mirror%2Fdsa-nagios.git Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios * 'master' of ssh://db.debian.org/git/dsa-nagios: bartok now has ulogd --- 1cf18b727908edcb74098b6db87b81d52f6aba14