Michal Čihař 41145feb12 Merge branch 'MAINT_3_3_5' into QA_3_3 ...

Conflicts:
	ChangeLog
	libraries/common.lib.php

2010-08-20 13:36:49 +02:00

..

mysql.dbi.lib.php

Escape error message coming from MySQL to avoid XSS on bad parameters.

2010-08-20 11:35:42 +02:00

mysqli.dbi.lib.php

Merge branch 'MAINT_3_3_5' into QA_3_3

2010-08-20 13:36:49 +02:00