Merge branch 'master' into m-p

Conflicts:
	debian/control
This commit is contained in:
Jan Wagner 2014-06-21 13:53:42 +02:00
commit 3d682f2570
3 changed files with 4 additions and 4 deletions

4
debian/changelog vendored
View file

@ -8,8 +8,8 @@ nagios-plugins (1.5-3) unstable; urgency=medium
* [38d8f67] Fixing latest changelog timestamp
* [7091aae] check_ssh: Drop 12_check_ssh_read_socket.dpatch
(Closes: #734811), this seems to make more touble in the wild as fixing
#739254, Thanks Jim Barber
(Closes: #734811, #739254), this seems to make more touble in the wild as
fixing #739254, Thanks Jim Barber
-- Jan Wagner <waja@cyconet.org> Mon, 17 Feb 2014 12:42:06 +0100