Merge pull request #388 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ-trivial to...

author Russ Combs (rucombs) <rucombs@cisco.com>

Mon, 4 Apr 2016 20:17:48 +0000 (16:17 -0400)

committer Russ Combs (rucombs) <rucombs@cisco.com>

Mon, 4 Apr 2016 20:17:48 +0000 (16:17 -0400)
author Russ Combs (rucombs) <rucombs@cisco.com>
Mon, 4 Apr 2016 20:17:48 +0000 (16:17 -0400)
committer Russ Combs (rucombs) <rucombs@cisco.com>
Mon, 4 Apr 2016 20:17:48 +0000 (16:17 -0400)
diff --cc src/network_inspectors/perf_monitor/flow_ip_tracker.cc
Simple merge
author	Russ Combs (rucombs) <rucombs@cisco.com>
	Mon, 4 Apr 2016 20:17:48 +0000 (16:17 -0400)
committer	Russ Combs (rucombs) <rucombs@cisco.com>
	Mon, 4 Apr 2016 20:17:48 +0000 (16:17 -0400)