Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commitd466571b9cb6efc44267be2cf995ebcd63289816
authorMadhura Jayaratne <madhura.cj@gmail.com>
Fri, 17 Jun 2011 02:03:44 +0000 (17 07:33 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Fri, 17 Jun 2011 02:03:44 +0000 (17 07:33 +0530)
tree34ad62da3a6f180439d776a26e8178581ff04b3b
parent2b6f807b6150b4bce8af603c6ee31ab2667e9c14
parent79f28d8dbbcfe0e42847d2bfa3bb5a9003f5f470
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
js/functions.js