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

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

Mon, 18 Apr 2016 18:26:44 +0000 (14:26 -0400)

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

Mon, 18 Apr 2016 18:26:44 +0000 (14:26 -0400)
author Russ Combs (rucombs) <rucombs@cisco.com>
Mon, 18 Apr 2016 18:26:44 +0000 (14:26 -0400)
committer Russ Combs (rucombs) <rucombs@cisco.com>
Mon, 18 Apr 2016 18:26:44 +0000 (14:26 -0400)
diff --cc src/network_inspectors/perf_monitor/base_tracker.cc
Simple merge
author	Russ Combs (rucombs) <rucombs@cisco.com>
	Mon, 18 Apr 2016 18:26:44 +0000 (14:26 -0400)
committer	Russ Combs (rucombs) <rucombs@cisco.com>
	Mon, 18 Apr 2016 18:26:44 +0000 (14:26 -0400)