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

diff --cc src/service_inspectors/nhttp_inspect/nhttp_enum.h
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_flow_data.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_flow_data.h
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_head_norm.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_head_norm.h
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_inspect.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_inspect.h
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_msg_body.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_msg_head_shared.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_msg_header.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_msg_request.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_msg_section.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_msg_section.h
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_msg_start.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_msg_status.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_normalizers.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_normalizers.h
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_splitter.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_splitter.h
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_stream_splitter.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_stream_splitter.h
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_test_input.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_test_input.h
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_transaction.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_uri.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_uri.h
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_uri_norm.cc
Simple merge

diff --cc src/service_inspectors/nhttp_inspect/nhttp_uri_norm.h
Simple merge