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

author Tom Peters <thopeter@cisco.com>

Wed, 11 Jun 2014 20:45:19 +0000 (16:45 -0400)

committer Tom Peters <thopeter@cisco.com>

Wed, 11 Jun 2014 20:45:19 +0000 (16:45 -0400)
author Tom Peters <thopeter@cisco.com>
Wed, 11 Jun 2014 20:45:19 +0000 (16:45 -0400)
committer Tom Peters <thopeter@cisco.com>
Wed, 11 Jun 2014 20:45:19 +0000 (16:45 -0400)
diff --cc src/service_inspectors/nhttp_inspect/nhttp_msg_section.cc
Simple merge
author	Tom Peters <thopeter@cisco.com>
	Wed, 11 Jun 2014 20:45:19 +0000 (16:45 -0400)
committer	Tom Peters <thopeter@cisco.com>
	Wed, 11 Jun 2014 20:45:19 +0000 (16:45 -0400)