Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 48b97ecd064402134531af15124cb7d79c1f2e27 https://github.com/phpmyadmin/phpmyadmin/commit/48b97ecd064402134531af15124c... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-10-07 (Tue, 07 Oct 2014) Changed paths: M ChangeLog M libraries/Util.class.php Log Message: ----------- bug #4252 Database-level permission bug for db names containing underscores Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com> Commit: b240909757a8bb35145ae774e2758e9897ee3e00 https://github.com/phpmyadmin/phpmyadmin/commit/b240909757a8bb35145ae774e275... Author: P <plamen_mbx@yahoo.com> Date: 2014-10-07 (Tue, 07 Oct 2014) Changed paths: M po/bg.po Log Message: ----------- Translated using Weblate (Bulgarian) Currently translated at 64.8% (1796 of 2768 strings) [CI skip] Commit: 718d02272b02d2616547f510fc8fce14401a262a https://github.com/phpmyadmin/phpmyadmin/commit/718d02272b02d2616547f510fc8f... Author: josep constanti <jconstanti@ovi.com> Date: 2014-10-07 (Tue, 07 Oct 2014) Changed paths: M po/ca.po Log Message: ----------- Translated using Weblate (Catalan) Currently translated at 86.0% (2381 of 2768 strings) [CI skip] Commit: 3ffcbcb52ba296c096697ac754727ae331a1e39a https://github.com/phpmyadmin/phpmyadmin/commit/3ffcbcb52ba296c096697ac75472... Author: Xosé Calvo <xosecalvo@gmail.com> Date: 2014-10-07 (Tue, 07 Oct 2014) Changed paths: M po/gl.po Log Message: ----------- Translated using Weblate (Galician) Currently translated at 86.3% (2389 of 2768 strings) [CI skip] Commit: 27ab463b9b0b655ba97db1cc0fab0e28335460b8 https://github.com/phpmyadmin/phpmyadmin/commit/27ab463b9b0b655ba97db1cc0fab... Author: Alexey Rubinov <orion1979@yandex.ru> Date: 2014-10-07 (Tue, 07 Oct 2014) Changed paths: M po/ru.po Log Message: ----------- Translated using Weblate (Russian) Currently translated at 100.0% (2768 of 2768 strings) [CI skip] Commit: eefd44a89b9f8b81cd026f31924f131905acaeb7 https://github.com/phpmyadmin/phpmyadmin/commit/eefd44a89b9f8b81cd026f31924f... Author: Weblate <noreply@weblate.org> Date: 2014-10-07 (Tue, 07 Oct 2014) Changed paths: M ChangeLog M libraries/DisplayResults.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 Commit: d2b9979d03baedf8ddf3543ea864fdbade917af8 https://github.com/phpmyadmin/phpmyadmin/commit/d2b9979d03baedf8ddf3543ea864... Author: Marc Delisle <marc@infomarc.info> Date: 2014-10-07 (Tue, 07 Oct 2014) Changed paths: M ChangeLog M libraries/Util.class.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 39fe63500d5fe84c73d9fe65802aad97f3fe57a1 https://github.com/phpmyadmin/phpmyadmin/commit/39fe63500d5fe84c73d9fe65802a... Author: Marc Delisle <marc@infomarc.info> Date: 2014-10-07 (Tue, 07 Oct 2014) Changed paths: M ChangeLog M libraries/Util.class.php Log Message: ----------- Fix merge conflict Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: c94915ae92ec8ca5e547db0655661fc474667558 https://github.com/phpmyadmin/phpmyadmin/commit/c94915ae92ec8ca5e547db065566... Author: Marc Delisle <marc@infomarc.info> Date: 2014-10-07 (Tue, 07 Oct 2014) Log Message: ----------- Merge commit 'eefd44a' Commit: a65ee6dac54245d9c8f519cef245d13e15dd50b7 https://github.com/phpmyadmin/phpmyadmin/commit/a65ee6dac54245d9c8f519cef245... Author: Marc Delisle <marc@infomarc.info> Date: 2014-10-07 (Tue, 07 Oct 2014) Log Message: ----------- Merge commit 'd2b9979' Commit: bb655d0c57e09b09edeeacb59b2e165a7b7d2c76 https://github.com/phpmyadmin/phpmyadmin/commit/bb655d0c57e09b09edeeacb59b2e... Author: Marc Delisle <marc@infomarc.info> Date: 2014-10-07 (Tue, 07 Oct 2014) Changed paths: M po/nl.po Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b96fd99e0cf3...bb655d0c57e0