modified:   test/netfifo/test_runners/Test_fifo_Runners.c
	modified:   test/netfifo/testfifonet.c
Merge branch 'ringlog' of github.com:0x42/fire into ringlog

Conflicts:
	test/netfifo/testfifonet.c

	modified:   .gitignore
	modified:   Makefile
	modified:   src/log/bologging.c
	modified:   src/log/bologging.h
	modified:   src/nettcp/bo_fifo.h
	modified:   src/nettcp/bo_net_fifo_server.c
	modified:   src/tools/dbgout.h
	modified:   test/netfifo/testfifonet.c
	modified:   Makefile
	new file:   moxa_serv/Makefile
	renamed:    moxa_serv.cfg -> moxa_serv/moxa_serv.cfg
	new file:   send.sh
	modified:   src/log/bologging.c
	modified:   src/main.c
	modified:   src/nettcp/bo_net_fifo_server.c