Complete merge of latest develop branch

2015-06-22 10:39:13 +01:00
parent 4c38e2224b
commit b880350cf3
8 changed files with 990 additions and 60 deletions
--- a/server/core/server.c
+++ b/server/core/server.c
@ -33,7 +33,7 @@
 * 30/08/14	Massimiliano Pinto	Addition of new service status description 
 * 30/10/14	Massimiliano Pinto	Addition of SERVER_MASTER_STICKINESS description
 * 01/06/15	Massimiliano Pinto	Addition of server_update_address/port
- *
+ * 19/06/15 Martin Brampton		Extra code for persistent connections
 * @endverbatim
 */
 #include <stdio.h>