Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin... master
commit681df0a9f9380ae2b5f8f065f6b5b3e986a23351
authorThilanka Kaushalya <lgtkaushalya@gmail.com>
Sat, 20 Aug 2011 10:28:37 +0000 (20 15:58 +0530)
committerThilanka Kaushalya <lgtkaushalya@gmail.com>
Sat, 20 Aug 2011 10:28:37 +0000 (20 15:58 +0530)
tree0b23dc64f23c3743987f474c14b0ad457f476d85
parent85f62705e4dbbbf34b1e1c3bbc790b66a0e78966
parent249a1d5c8cd7796cb240f99389b731df0f02cc43
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin