modified:   .gitignore
	new file:   db-pkts/db2-create-table.pcapng
	new file:   db-pkts/db2-drop-table-on-client-error.pcapng
	new file:   db-pkts/db2-drop-table.pcapng
	new file:   db-pkts/db2-list-tables.pcapng
	new file:   db-pkts/db2-login-tanb.pcapng
	new file:   db-pkts/db2-login.pcapng
	new file:   db-pkts/db2-login2.pcapng
	new file:   db-pkts/db2-select.pcapng
	new file:   db-pkts/mysql-login.pcapng
	new file:   db-pkts/mysql-quit.pcapng
	new file:   db-pkts/mysql-show-tables.pcapng
	new file:   db-pkts/mysql-use-db.pcapng
	new file:   db-pkts/oracl-11g-sqlplus-login.pcapng
	new file:   db-pkts/oracl-11g-sqlplus-select.pcapng
	new file:   db-pkts/oracl-11g-sqlplus-select2.pcapng
	new file:   db-pkts/oracl-11g-sqlplus-select3.pcapng
	new file:   db-pkts/oracl-11g-sqlplus-select4.pcapng
	new file:   db-pkts/oracle9i-login-ok.pcapng
	new file:   db-pkts/oracle9i-select.pcapng
	new file:   db-pkts/tds4-query-pkt.pcapng
	new file:   db-pkts/tds4.2-login-pkt.pcapng
	new file:   db-pkts/tds7-login-pkt.pcapng
	new file:   db-pkts/tds7-query-pkt.pcapng
	deleted:    scripts/Makefile.am
	new file:   src/log-drdalog.c
	new file:   src/log-drdalog.h
	modified:   Makefile
	modified:   cfg.sh
	modified:   contrib/Makefile
	modified:   contrib/file_processor/Action/Makefile
	modified:   contrib/file_processor/Makefile
	modified:   contrib/file_processor/Processor/Makefile
	modified:   contrib/tile_pcie_logd/Makefile
	modified:   doc/Makefile
	modified:   rules/Makefile
	modified:   src/Makefile
	modified:   src/app-layer-mysql.c
	modified:   src/build-info.h
	modified:   src/log-mysqllog.c
	modified:   src/util-error.h
Merge branch 'log' into merge-upstream
	modified:   src/app-layer-tds-common.c
	modified:   src/app-layer-tds-common.h
	modified:   src/app-layer-tds.c
	modified:   src/log-mysqllog.c
	modified:   src/log-tdslog.c
remove useless files out of git
	modified:   Makefile
	modified:   cfg.sh
	modified:   contrib/Makefile
	modified:   contrib/file_processor/Action/Makefile
	modified:   contrib/file_processor/Makefile
	modified:   contrib/file_processor/Processor/Makefile
	modified:   contrib/tile_pcie_logd/Makefile
	modified:   doc/Makefile
	modified:   rules/Makefile
	modified:   src/Makefile
	modified:   src/build-info.h
update:
    - add json output support
    - merge upstream
add login parse for drda
	modified:   src/Makefile
	modified:   src/Makefile.am
	modified:   src/app-layer-drda-common.c
	modified:   src/app-layer-drda.c
	modified:   src/app-layer-parser.c
	modified:   src/app-layer-tns-common.h
	modified:   src/app-layer-tns.c
	modified:   src/app-layer-tns.h
	new file:   src/app-layer-tns11g-common.c
	new file:   src/app-layer-tns11g-common.h
	new file:   src/app-layer-tns12c-common.h
	new file:   src/app-layer-tns12c.c
	new file:   src/app-layer-tns12c.h
	modified:   src/drda-code-point.c
	modified:   src/util-error.h
Merge branch 'master' of https://github.com/coanor/suricata
Merge branch 'json-output'