Michal Čihař 862e3ca2a7 Merge branch 'QA_3_3' ...

Conflicts:
	libraries/core.lib.php
	server_databases.php
	server_privileges.php

2010-08-20 13:40:37 +02:00

..

mysql.dbi.lib.php

Merge branch 'QA_3_3'

2010-08-20 13:40:37 +02:00

mysqli.dbi.lib.php

Merge branch 'QA_3_3'

2010-08-20 13:40:37 +02:00