tree e8ab9896bfd81bfcdc93caedba53e3e40126aec7
parent f603108b303a6070d3c85c6048db32cf42440a28
parent 0d0a4629702eb9f9fe9956c1bac4b445610ff3c7
author Bart Van Assche <bvanassche@acm.org> 1379778349 +0200
committer Bart Van Assche <bvanassche@acm.org> 1379778349 +0200

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

* V5-4-patches:
  Simplify snmpTargetAddr_rowStatusCheck()
  testing/fulltests/default/T068execfix_simple: Simplify
  CHANGES: Win32: perl: BUG: 2488: Avoid "Free to wrong pool" error
  CHANGES: perl: BUG: 2402: Add support for SNMPv3 traps

Conflicts:
	agent/mibgroup/target/snmpTargetAddrEntry.c