Andrew Bettison 8425882ffc Merge branch 'newconfig' into 'master' ...

Conflicts:
	commandline.c
	conf.h
	dataformats.c
	log.h
	overlay_address.c
	overlay_interface.c
	packetformats.c
	rhizome.c
	serval.h
	tests/directory_service
	vomp_console.c

2012-12-07 14:09:55 +10:30

..

config

Servald 'config [ set|del ... ] ... ' command

2012-12-06 12:31:19 +10:30

directory_service

Merge branch 'newconfig' into 'master'

2012-12-07 14:09:55 +10:30

dnahelper

Servald 'config [ set|del ... ] ... ' command

2012-12-06 12:31:19 +10:30

dnaprotocol

Merge branch 'newconfig' into 'master'

2012-12-07 14:09:55 +10:30

jni

JNI interface returns byte[] instead of String

2012-11-07 17:12:04 +10:30

rhizomeops

Rhizome extract manifest to '-' writes to output

2012-11-07 20:29:12 +10:30

rhizomeprotocol

Merge branch 'newconfig' into 'master'

2012-12-07 14:09:55 +10:30

rhizomestress

Merge branch 'newconfig' into 'master'

2012-12-07 14:09:55 +10:30

routing

Merge branch 'newconfig' into 'master'

2012-12-07 14:09:55 +10:30

server

Servald 'config [ set|del ... ] ... ' command

2012-12-06 12:31:19 +10:30