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
2014-02-07 11:06:37 +02:00
2014-02-07 11:06:37 +02:00