[Pkg-nagios-changes] [pkg-nagios-snmp-plugins] 24/36: Merge branch 'master' of github.com:waja/nagios-snmp-plugins

[Jan Wagner]

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

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

commit fe8f55b3ec5f56f93fa2bb04e087d4dd924bd894
Merge: 1ae942a be2cd6a
Author: Jan Wagner <waja at cyconet.org>
Date:   Sun Mar 2 22:29:27 2014 +0100

    Merge branch 'master' of github.com:waja/nagios-snmp-plugins
    
    Conflicts:
    	debian/control
    	debian/patches/series
    	debian/rules


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