Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit701bc67342ef0bd7fcdbc22de5683ea07bbd54c4
authorlorilee <leelorik@gmail.com>
Mon, 2 Aug 2010 21:17:22 +0000 (2 14:17 -0700)
committerlorilee <leelorik@gmail.com>
Mon, 2 Aug 2010 21:17:22 +0000 (2 14:17 -0700)
tree45783b0042b002488c26a9452fdf31da40d9f6d5
parent8120a00af7d921be528eb1943a667ef7f5c9c43c
parent887e2be664f04827fe164d724d233598a251bcb9
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
js/functions.js