Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dd2cf47fdeb990a45b34d5b321e46ee691f72a5f https://github.com/phpmyadmin/phpmyadmin/commit/dd2cf47fdeb990a45b34d5b321e4... Author: J.M me@mynetx.net Date: 2012-06-29 (Fri, 29 Jun 2012)

Changed paths: M libraries/plugins/PluginObserver.class.php

Log Message: ----------- Fix bug #3538655 with a workaround, revert this commit when PMA drops PHP5.2 support

Commit: b1b674afdf30080217cc355c1bd8f2de300a17f3 https://github.com/phpmyadmin/phpmyadmin/commit/b1b674afdf30080217cc355c1bd8... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-29 (Fri, 29 Jun 2012)

Changed paths: M libraries/Menu.class.php M po/pt_BR.po M po/sk.po A test/classes/PMA_DisplayResults_test.php M test/libraries/core/PMA_getTableCount_test_dis.php M test/libraries/core/PMA_headerLocation_test_disabled.php

Log Message: ----------- Merge branch 'master' of git://github.com/phpmyadmin/phpmyadmin

Commit: c1b8b9ca867a0bd16f04680877b5ac04185afa1f https://github.com/phpmyadmin/phpmyadmin/commit/c1b8b9ca867a0bd16f04680877b5... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-29 (Fri, 29 Jun 2012)

Changed paths: M db_operations.php

Log Message: ----------- oop: rename database bug

Commit: e8ef29f92fb39083c53ed9bee958fd317b699155 https://github.com/phpmyadmin/phpmyadmin/commit/e8ef29f92fb39083c53ed9bee958... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-29 (Fri, 29 Jun 2012)

Changed paths: M libraries/display_import_ajax.lib.php

Log Message: ----------- oop: fix bug #3538914 upload progress

Commit: 7a5829414482f9cb093de514b80654d018cd3ad4 https://github.com/phpmyadmin/phpmyadmin/commit/7a5829414482f9cb093de514b806... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-29 (Fri, 29 Jun 2012)

Changed paths: M db_search.php A libraries/db_search.lib.php

Log Message: ----------- Merge branch 'master' of git://github.com/phpmyadmin/phpmyadmin

Commit: c60fd7d418e60813d08c54147d06ba9ce3611720 https://github.com/phpmyadmin/phpmyadmin/commit/c60fd7d418e60813d08c54147d06... Author: Alex Marin alex.ukf@gmail.com Date: 2012-06-29 (Fri, 29 Jun 2012)

Changed paths: M db_search.php A libraries/db_search.lib.php

Log Message: ----------- Merge branch 'master' into plugins-and-OOP

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0e4d7af07afd...c60fd7d418e6