[Pkg-net-snmp-commits] [pkg-net-snmp] 05/05: Merge branch 'master' of git+ssh://anonscm.debian.org/git/pkg-net-snmp/pkg-net-snmp

[Hideki Yamane]

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

henrich pushed a commit to branch master
in repository pkg-net-snmp.

commit 771b42209a4a0318ede52b751a2286fbf12ceb39
Merge: 72e4ea4 e572e16
Author: Hideki Yamane <henrich at debian.org>
Date:   Wed Sep 17 16:03:46 2014 +0900

    Merge branch 'master' of git+ssh://anonscm.debian.org/git/pkg-net-snmp/pkg-net-snmp
    
    Conflicts:
    	debian/libsnmp-perl.install
    	debian/patches/series


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