Merge branch 'master' of /nfs/home/rucombs/Snort++

author Tom Peters <thopeter@cisco.com>

Mon, 28 Jul 2014 21:13:33 +0000 (17:13 -0400)

committer Tom Peters <thopeter@cisco.com>

Mon, 28 Jul 2014 21:13:33 +0000 (17:13 -0400)
author Tom Peters <thopeter@cisco.com>
Mon, 28 Jul 2014 21:13:33 +0000 (17:13 -0400)
committer Tom Peters <thopeter@cisco.com>
Mon, 28 Jul 2014 21:13:33 +0000 (17:13 -0400)
diff --cc src/service_inspectors/nhttp_inspect/nhttp_inspect.cc
Simple merge
author	Tom Peters <thopeter@cisco.com>
	Mon, 28 Jul 2014 21:13:33 +0000 (17:13 -0400)
committer	Tom Peters <thopeter@cisco.com>
	Mon, 28 Jul 2014 21:13:33 +0000 (17:13 -0400)