[Phpmyadmin-git] [phpmyadmin/phpmyadmin] b0f96d: Merge remote-tracking branch 'origin/master'

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b0f96d7f81da51a5db5d4ef3d4f428ce9465010e https://github.com/phpmyadmin/phpmyadmin/commit/b0f96d7f81da51a5db5d4ef3d4f… Author: Michal Čihař <weblate(a)l10n.cihar.com> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M ChangeLog M js/makegrid.js M themes/original/css/theme_right.css.php M themes/pmahomme/css/theme_right.css.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Commit: 4d2f1cb8d7fe15bce7c7fa6ef0730fd60ed65a0c https://github.com/phpmyadmin/phpmyadmin/commit/4d2f1cb8d7fe15bce7c7fa6ef07… Author: Everton R <everton(a)tconibo.org> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate. Commit: 3c8c264b13a5bbbccdbfb6e2d9dc9daf21e0cc15 https://github.com/phpmyadmin/phpmyadmin/commit/3c8c264b13a5bbbccdbfb6e2d9d… Author: Everton R <everton(a)tconibo.org> Date: 2012-04-02 (Mon, 02 Apr 2012) Changed paths: M po/pt_BR.po Log Message: ----------- Translated using Weblate. Commit: 092eee8d534004dde2dfe023466fc5579cb46ec2 https://github.com/phpmyadmin/phpmyadmin/commit/092eee8d534004dde2dfe023466… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-03 (Tue, 03 Apr 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_4' into MAINT_3_5_0 Commit: 893d094dc04bf174bc563a88161bf2abf26acc55 https://github.com/phpmyadmin/phpmyadmin/commit/893d094dc04bf174bc563a88161… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-03 (Tue, 03 Apr 2012) Changed paths: M po/pt_BR.po Log Message: ----------- Merge branch 'MAINT_3_5_0' into QA_3_5 Commit: d384351c0e61cef6c1b25c76205057b5823989c8 https://github.com/phpmyadmin/phpmyadmin/commit/d384351c0e61cef6c1b25c76205… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-04-03 (Tue, 03 Apr 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/330a1aa...d384351