Merge branch 'master' of ssh://chivas64dev.cm.sourcefire.com/nfs/home/rucombs/Snort...

diff --cc doc/cmake_scripts.cmake
Simple merge

diff --cc src/codecs/codec_api.cc
Simple merge

diff --cc src/codecs/codec_module.h
Simple merge

diff --cc src/codecs/ip/cd_frag.cc
Simple merge

diff --cc src/codecs/ip/cd_gre.cc
Simple merge

diff --cc src/codecs/ip/cd_icmp4.cc
Simple merge

diff --cc src/codecs/ip/cd_icmp6.cc
Simple merge

diff --cc src/codecs/ip/cd_ipv4.cc
Simple merge

diff --cc src/codecs/ip/cd_ipv6.cc
Simple merge

diff --cc src/codecs/ip/cd_routing.cc
Simple merge

diff --cc src/codecs/ip/cd_tcp.cc
Simple merge

diff --cc src/codecs/ip/cd_udp.cc
Simple merge

diff --cc src/codecs/link/cd_arp.cc
Simple merge

diff --cc src/codecs/link/cd_mpls.cc
Simple merge

diff --cc src/codecs/link/cd_pppoe.cc
Simple merge

diff --cc src/codecs/link/cd_vlan.cc
Simple merge

diff --cc src/codecs/misc/cd_gtp.cc
Simple merge

diff --cc src/codecs/misc/cd_icmp4_ip.cc
Simple merge

diff --cc src/codecs/misc/cd_icmp6_ip.cc
Simple merge

diff --cc src/codecs/misc/cd_llc.cc
Simple merge

diff --cc src/codecs/misc/cd_teredo.cc
Simple merge

diff --cc src/codecs/root/cd_eth.cc
Simple merge

diff --cc src/codecs/root/cd_i4l_rawip.cc
Simple merge

diff --cc src/codecs/root/cd_wlan.cc
Simple merge

diff --cc src/framework/codec.h
Simple merge

diff --cc src/log/log_text.cc
Simple merge

diff --cc src/log/log_text.h
Simple merge

diff --cc src/main/snort_config.cc
Simple merge

diff --cc src/protocols/layer.cc
Simple merge

diff --cc src/protocols/packet_manager.cc
Simple merge

diff --cc src/protocols/protocol_ids.h
Simple merge

diff --cc tools/snort2lua/data/dt_data.cc
Simple merge

diff --cc tools/snort2lua/helpers/converter.cc
Simple merge

diff --cc tools/snort2lua/helpers/parse_cmd_line.cc
Simple merge

diff --cc tools/snort2lua/helpers/s2l_markup.cc
Simple merge

diff --cc tools/snort2lua/helpers/s2l_markup.h
Simple merge

diff --cc tools/snort2lua/preprocessor_states/pps_normalizers.cc
Simple merge

diff --cc tools/snort2lua/rule_states/rule_content.cc
Simple merge