Michal Čihař cdffe9fb97 Merge remote-tracking branch 'origin/QA_3_4' ... Conflicts: libraries/dbi/mysql.dbi.lib.php		2011-12-14 10:06:36 +01:00
..
drizzle-wrappers.lib.php	Use package name PhpMyAdmin	2011-10-25 10:13:17 +02:00
drizzle.dbi.lib.php	Use package name PhpMyAdmin	2011-10-25 10:13:17 +02:00
mysql.dbi.lib.php	Merge remote-tracking branch 'origin/QA_3_4'	2011-12-14 10:06:36 +01:00
mysqli.dbi.lib.php	Use package name PhpMyAdmin	2011-10-25 10:13:17 +02:00