Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commitef17d6e9f6f7f3c5f6f0af7aacf7d306d79e814d
authorMadhura Jayaratne <madhura.cj@gmail.com>
Fri, 17 Jun 2011 12:47:14 +0000 (17 18:17 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Fri, 17 Jun 2011 12:47:14 +0000 (17 18:17 +0530)
tree4a095e949f1207e4c49b2a43b868a33610e72404
parentf10bf59a8dbfe987c7f947746e926f054ac8ad83
parentc3948c1cdde33cbb4302586bee3ced5cb7b15626
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
js/functions.js
themes/original/css/theme_right.css.php
themes/pmahomme/css/theme_right.css.php