Michal Čihař 5c63cbd231 Merge branch 'QA_3_3' ...

Conflicts:
	Documentation.html
	README
	libraries/Config.class.php
	translators.html

2010-08-23 17:10:04 +02:00

..

mysql.dbi.lib.php

Merge branch 'QA_3_3'

2010-08-23 17:10:04 +02:00

mysqli.dbi.lib.php

Merge branch 'QA_3_3'

2010-08-23 17:10:04 +02:00