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-05 14:49:05 +01:00
2013-08-04 23:02:29 +03:00
2013-07-28 05:31:11 +00:00
2013-12-13 19:11:10 +02:00
2013-07-28 05:31:11 +00:00
2014-02-28 12:28:14 +01:00
2014-02-14 17:27:17 +01:00
2013-07-28 05:31:11 +00:00
2014-02-14 17:27:17 +01:00
2013-07-28 05:31:11 +00:00
2014-01-08 17:02:59 +01:00
2014-02-05 12:20:53 +01:00
2013-07-28 05:31:11 +00:00
2013-07-28 05:31:11 +00:00
2013-09-12 22:17:11 +03:00
2013-10-22 10:30:16 +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
2014-01-27 22:56:33 +02:00
2013-08-28 22:49:27 +03:00
2013-07-28 05:31:11 +00:00
2014-02-28 12:28:14 +01:00