Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5
commit48cbfe14efe6716ba01f447cc4bb25c5f1b7acdd
authorMadhura Jayaratne <madhura.cj@gmail.com>
Sat, 18 Feb 2012 09:22:37 +0000 (18 14:52 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Sat, 18 Feb 2012 09:22:37 +0000 (18 14:52 +0530)
tree7e6193a1b0d70fdb8dbce8fb05a46ab93a5db22e
parente14b73d23e20bd334e92180518ada71e6654f96d
parent277045b62d90ad773cae213348c4133f770ba5df
Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5
libraries/database_interface.lib.php