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/service.c
+++ b/server/core/service.c
@ -36,7 +36,8 @@
 * 06/02/15	Mark Riddoch		Added caching of authentication data
 * 18/02/15	Mark Riddoch		Added result set management
 * 03/03/15	Massimiliano Pinto	Added config_enable_feedback_task() call in serviceStartAll
- *
+ * 19/06/15	Martin Brampton		More meaningful names for temp variables
+
 * @endverbatim
 */
 #include <stdio.h>