[Pkg-nagios-changes] [pkg-monitoring-plugins] 33/51: Merge branch 'master' into m-p

[Jan Wagner]

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

waja pushed a commit to branch master
in repository pkg-monitoring-plugins.

commit dc2ddb19f7aee2a0e18586b2ea277f42cbaa433a
Merge: 3d682f2 7cb5f53
Author: Jan Wagner <waja at cyconet.org>
Date:   Mon Jun 23 23:06:34 2014 +0200

    Merge branch 'master' into m-p

 debian/pluginconfig/http.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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