Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2605 of 2605)
Merge remote-tracking branch 'origin/master'
Fix bug #3876 [import] PHP 5.2 - unexpected T_PAAMAYIM_NEKUDOTAYIM
Merge branch 'QA_4_0'
Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (2605 of 2605)
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
4.0.0-rc2
Merge branch 'QA_4_0'
Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0
add test case for PMA_Footer_test.php
- add testGetScripts
add test case for Config.class.php:
1 testIsGitRevision
2 testCheckHTTP

per http://ci.phpmyadmin.net/job/phpMyAdmin/cloverphp/libraries_Config.class.php.html
It can increase a lot of code coverage
Merge pull request #255 from adamgsoc2013/UT_PMA_Footer_test

add test case for PMA_Footer_test.php
follow PMA coding style, add space after comma.
Merge pull request #256 from adamgsoc2013/UT_config2

add test case for Config.class.php:
Merge remote-tracking branch 'origin/QA_4_0'
Translated using Weblate (Interlingua)

Currently translated at 4.4% (115 of 2605)
Merge remote-tracking branch 'origin/master'
Fix indentation
Various JS improvements