tree 52932db72f5e9ee31965c1ec3728250923568e8e
parent a6e1851fbe747cf15ed075807781ce89a34e96c2
parent 9a6f566392a3cf12dab488a76d69fc873dbec2ac
author Bart Van Assche <bvanassche@acm.org> 1380357863 +0200
committer Bart Van Assche <bvanassche@acm.org> 1380357863 +0200

Merge branch 'V5-4-patches' into V5-5-patches

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

Conflicts:
	agent/agent_handler.c
	agent/agent_trap.c
	agent/helpers/table_data.c
	agent/helpers/table_dataset.c
	agent/helpers/table_row.c
	agent/helpers/table_tdata.c
	agent/helpers/watcher.c
	agent/mibgroup/notification/snmpNotifyFilterProfileTable.c
	agent/mibgroup/utilities/override.c
	apps/snmptrapd_handlers.c
	include/net-snmp/library/tools.h
	local/mib2c.iterate_access.conf
	man/netsnmp_util.3
	snmplib/snmp_api.c
	snmplib/tools.c
	win32/libsnmp_dll/libsnmp.def.in