Merge remote-tracking branch 'origin/master' into drizzle
[phpmyadmin.git] / libraries / dbi / 
tree8ec068abad65e7dfbed10f9ee1430afeefc0969f
drwxr-xr-x   ..
-rw-r--r-- 12047 mysql.dbi.lib.php
-rw-r--r-- 17876 mysqli.dbi.lib.php