Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4c7d3c0e287a383dcc5eebb2f7915e6c72caed87 https://github.com/phpmyadmin/phpmyadmin/commit/4c7d3c0e287a383dcc5eebb2f791... Author: Michal Čihař weblate@l10n.cihar.com Date: 2012-04-02 (Mon, 02 Apr 2012)

Changed paths: M scripts/decode_bug.php

Log Message: ----------- Merge remote-tracking branch 'origin/master'

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

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

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

Changed paths: M po/de.po M po/es.po M po/fr.po M po/ja.po M po/lt.po M po/nl.po M po/ro.po M po/si.po M po/tr.po

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

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

Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/517aa61...14ed639