Martin Brampton 4c38e2224b Merge remote-tracking branch 'origin/develop' into MXS-122
Conflicts:
	server/core/CMakeLists.txt
	server/core/dcb.c
	server/include/dcb.h
	server/include/server.h
	server/modules/protocol/mysql_backend.c
2015-06-19 23:12:54 +01:00
..
2014-08-18 09:39:29 +00:00
2015-04-26 20:08:27 +03:00
2015-05-27 09:57:18 +01:00