tree d375af9baf1921f08b8403de1ea44d402087aecc
parent 6c28d8034d768cf040753ec91ad667705325dfc4
parent 1b84458321fa219b0d416c154053bf08c23aeb99
author Bart Van Assche <bvanassche@acm.org> 1380359232 +0200
committer Bart Van Assche <bvanassche@acm.org> 1380359232 +0200

Merge branch 'V5-6-patches' into V5-7-patches

* V5-6-patches:
  CHANGES: snmplib: Rename memdup() into netsnmp_memdup()

Conflicts:
	agent/agent_trap.c
	agent/helpers/instance.c
	agent/helpers/old_api.c
	agent/mibgroup/disman/ping/pingCtlTable.c
	snmplib/snmp_api.c
	snmplib/snmpv3.c
	snmplib/transports/snmpTLSTCPDomain.c