Andrew Bettison 8020ea3b74 Merge branch 'eventscheduler' into master ...

Conflicts:
	commandline.c
	monitor.c
	overlay.c
	overlay_interface.c
	overlay_packetformats.c
	rhizome_fetch.c
	rhizome_http.c
	rhizome_packetformats.c
	serval.h
	server.c
	testdefs.sh
	testframework.sh
	tests/dnaprotocol
	tests/server

2012-07-03 10:26:22 +09:30

..

config

Improve test definitions

2012-06-22 15:56:28 +09:30

dnaprotocol

Merge branch 'eventscheduler' into master

2012-07-03 10:26:22 +09:30

jni

Remove obsolete tests, rename others

2012-06-04 18:28:38 +09:30

rhizome

Add server start/stop tests

2012-06-26 15:52:37 +09:30

server

Fix server test fixtures to isolate concurrent running tests

2012-07-02 16:08:39 +09:30