modified:   src/nettcp/bo_net.c
	modified:   test/botest/test_netfifo.out
Merge branch 'ringlog' of github.com:0x42/fire into ringlog

Conflicts:
	test/botest/test_netfifo.out

	modified:   .gitignore
	modified:   src/nettcp/bo_net_fifo_server.c
	deleted:    test/botest/test_netfifo.out
	modified:   test/netfifo/testfifonet.c