MassimilianoPinto
45543eceed
Merge branch 'fix-127' into feature-MAX-2
Conflicts:
server/core/dbusers.c
server/core/service.c
server/core/users.c
server/include/dbusers.h
server/include/users.h
server/modules/protocol/mysql_client.c
server/modules/protocol/mysql_common.c
2014-02-28 12:28:14 +01:00
..
2014-02-17 16:22:52 +01:00
2014-02-05 14:49:05 +01:00
2013-12-12 16:14:33 +02:00
2013-12-13 19:11:10 +02:00
2014-02-12 18:55:44 +02:00
2014-02-14 11:39:21 +01:00
2014-02-28 12:28:14 +01:00
2014-02-10 23:21:03 +02:00
2014-02-07 12:47:07 +02:00
2014-02-14 12:27:33 +01:00
2013-12-13 19:11:10 +02:00
2014-02-14 10:49:06 +01:00
2013-12-13 19:11:10 +02:00
2014-02-07 11:11:47 +02:00
2013-07-28 05:31:11 +00:00
2013-07-28 05:31:11 +00:00
2013-12-12 16:14:33 +02:00
2014-02-14 17:27:17 +01:00
2013-12-12 16:14:33 +02:00
2013-12-12 16:14:33 +02:00
2014-02-28 12:28:14 +01:00
2014-01-27 22:56:33 +02:00
2013-07-28 05:31:11 +00:00
2013-07-28 05:31:11 +00:00
2014-02-28 12:28:14 +01:00
2013-12-13 19:11:10 +02:00