From: Peter Palfrader Date: Fri, 18 Mar 2011 08:52:27 +0000 (+0100) Subject: Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=21994679ad2f2d01c0e438f80751c386933cba13;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: alkman -> squeeze Signed-off-by: Martin Zobel-Helas englund -> squeeze Signed-off-by: Martin Zobel-Helas --- 21994679ad2f2d01c0e438f80751c386933cba13