[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 07/07: Merge remote-tracking branch 'origin/master'

[Bernd Zeimetz]

This is an automated email from the git hooks/post-receive script.

bzed pushed a commit to branch master
in repository pkg-nagios-plugins-contrib.

commit 4b9f4ad410b682638ca51e246d41f4e4994b5691
Merge: f5deb22 dfb170c
Author: Bernd Zeimetz <bernd at bzed.de>
Date:   Fri Apr 25 15:35:03 2014 +0200

    Merge remote-tracking branch 'origin/master'

 check_memory/check_memory | 13 ++++++-------
 check_memory/control      |  6 +++---
 check_snmp_time/control   |  2 +-
 debian/control            | 24 ++++++++++++------------
 debian/control.in         |  8 ++++----
 debian/copyright          | 36 +++++++++++++++++++++++++++++-------
 6 files changed, 55 insertions(+), 34 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins-contrib