Branch: refs/heads/MAINT_3_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8972ac9c152c476bde8c538757bc443c4747f725 https://github.com/phpmyadmin/phpmyadmin/commit/8972ac9c152c476bde8c538757bc... Author: Michal Čihař mcihar@suse.cz Date: 2012-04-02 (Mon, 02 Apr 2012)

Changed paths: M scripts/decode_bug.php

Log Message: ----------- Verify we got string

Commit: e7517ed26871a73a5e55c1a161f0ccbd324d6aab https://github.com/phpmyadmin/phpmyadmin/commit/e7517ed26871a73a5e55c1a161f0... Author: Michal Čihař mcihar@suse.cz Date: 2012-04-02 (Mon, 02 Apr 2012)

Changed paths: M scripts/decode_bug.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/911c762...e7517ed