Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commitf89a16ed81e111abd7cf55d506ec944b4697ba4e
authorThilanka Kaushalya <lgtkaushalya@gmail.com>
Wed, 27 Jul 2011 14:27:08 +0000 (27 19:57 +0530)
committerThilanka Kaushalya <lgtkaushalya@gmail.com>
Wed, 27 Jul 2011 14:27:08 +0000 (27 19:57 +0530)
treebba4a98d70ea173cf06d9530bdf1984e18210826
parentf45c4292c1eccbb10569e78219b2bb32eb139852
parentad4975b82d6beb67d78c0e64092ef29f98a257e3
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin