Markus Makela c4414e708b Merge branch 'release-1.2' into develop
Conflicts:
	server/core/adminusers.c
	server/modules/protocol/mysql_client.c
2015-07-11 17:12:48 +03:00
2015-07-10 22:23:10 +03:00
2015-07-09 23:52:31 +03:00
2015-07-10 13:52:42 +03:00
2015-03-24 07:33:51 +02:00
2015-03-24 07:33:51 +02:00
2015-06-12 02:55:07 +03:00
2015-03-24 07:33:51 +02:00
Description
No description provided
118 MiB
Languages
C 50.9%
C++ 30.8%
Shell 3.7%
HTML 3.2%
Tcl 3.1%
Other 8.1%