Branch: refs/heads/master 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

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

Changed paths: M scripts/decode_bug.php

Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5

Commit: 7464f215aa8bf8915ff9cbca543811b89516e8c4 https://github.com/phpmyadmin/phpmyadmin/commit/7464f215aa8bf8915ff9cbca5438... 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_5'

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

Changed paths: M scripts/decode_bug.php

Log Message: ----------- Coding style

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5b09d0f...517aa61