[Phpmyadmin-git] [phpmyadmin/phpmyadmin] ab9036: 4.2.10-dev

Sat Oct 11 14:31:17 CEST 2014

  Branch: refs/heads/STABLE
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ab9036fa605104d47d50af30989f72b12a110f79
      https://github.com/phpmyadmin/phpmyadmin/commit/ab9036fa605104d47d50af30989f72b12a110f79
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-20 (Sat, 20 Sep 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.2.10-dev

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: ea2dd3c1713156b97cc2e2046af120f70fe3935b
      https://github.com/phpmyadmin/phpmyadmin/commit/ea2dd3c1713156b97cc2e2046af120f70fe3935b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-21 (Sun, 21 Sep 2014)

  Changed paths:
    M ChangeLog
    M libraries/Config.class.php
    M test/classes/PMA_Theme_test.php

  Log Message:
  -----------
  bug #4361 Can't change font size (when config.inc.php not present)

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: 31792c8091dc9548e82ed66b3dd07e4612d0ecd5
      https://github.com/phpmyadmin/phpmyadmin/commit/31792c8091dc9548e82ed66b3dd07e4612d0ecd5
  Author: Remi Collet <fedora at famillecollet.com>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M libraries/core.lib.php

  Log Message:
  -----------
  fix gettext include path

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: d2fcf0121309d9a1f47b645e909fd6da1bc33407
      https://github.com/phpmyadmin/phpmyadmin/commit/d2fcf0121309d9a1f47b645e909fd6da1bc33407
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M libraries/Util.class.php

  Log Message:
  -----------
  Apply fixup for documentation anchor as well

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 91a919e94d5d6c4f59da8681f5afffb684b11391
      https://github.com/phpmyadmin/phpmyadmin/commit/91a919e94d5d6c4f59da8681f5afffb684b11391
  Author: Raul Malea <raul.malea at gmail.com>
  Date:   2014-09-24 (Wed, 24 Sep 2014)

  Changed paths:
    M po/ro.po

  Log Message:
  -----------
  Translated using Weblate (Romanian)

Currently translated at 61.9% (1714 of 2768)

[ci skip]

  Commit: da6e5b6e8e1cdd31900db2bed8afc48177191fa5
      https://github.com/phpmyadmin/phpmyadmin/commit/da6e5b6e8e1cdd31900db2bed8afc48177191fa5
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-25 (Thu, 25 Sep 2014)

  Changed paths:
    M ChangeLog
    M libraries/structure.lib.php

  Log Message:
  -----------
  bug #4542 Tab key in column name not shown

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: 5d6041510537d6daa3dcef72d0b844e8a59fd71c
      https://github.com/phpmyadmin/phpmyadmin/commit/5d6041510537d6daa3dcef72d0b844e8a59fd71c
  Author: Dong-bum Kim <dongbum at me.com>
  Date:   2014-09-25 (Thu, 25 Sep 2014)

  Changed paths:
    M po/ko.po

  Log Message:
  -----------
  Translated using Weblate (Korean)

Currently translated at 84.9% (2351 of 2768)

[ci skip]

  Commit: e1a420fbbcadf6955050e8a1808231d9b109001e
      https://github.com/phpmyadmin/phpmyadmin/commit/e1a420fbbcadf6955050e8a1808231d9b109001e
  Author: Internationalization Ro <i18nro at yahoo.com>
  Date:   2014-09-25 (Thu, 25 Sep 2014)

  Changed paths:
    M po/ro.po

  Log Message:
  -----------
  Translated using Weblate (Romanian)

Currently translated at 62.3% (1725 of 2768)

[ci skip]

  Commit: 472d3346c14154d1b2669f2f6648a898b52829d0
      https://github.com/phpmyadmin/phpmyadmin/commit/472d3346c14154d1b2669f2f6648a898b52829d0
  Author: கணேஷ் குமார் <GANESHTHEONE at gmail.com>
  Date:   2014-09-25 (Thu, 25 Sep 2014)

  Changed paths:
    M po/ta.po

  Log Message:
  -----------
  Translated using Weblate (Tamil)

Currently translated at 37.4% (1037 of 2768)

[ci skip]

  Commit: 911d8528d4edf0ea041f6826e6358f8d2fbab9a6
      https://github.com/phpmyadmin/phpmyadmin/commit/911d8528d4edf0ea041f6826e6358f8d2fbab9a6
  Author: Weblate <noreply at weblate.org>
  Date:   2014-09-25 (Thu, 25 Sep 2014)

  Changed paths:
    M ChangeLog
    M libraries/structure.lib.php

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

  Commit: deea8c6946bad7d071e8a214a2b005856862f527
      https://github.com/phpmyadmin/phpmyadmin/commit/deea8c6946bad7d071e8a214a2b005856862f527
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-27 (Sat, 27 Sep 2014)

  Changed paths:
    M ChangeLog
    M export.php
    M libraries/plugins/export/ExportPdf.class.php

  Log Message:
  -----------
  bug in PDF export: title not present in PDF

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: 834f8ec51f8108fb9c754687a62c25a0b09f5099
      https://github.com/phpmyadmin/phpmyadmin/commit/834f8ec51f8108fb9c754687a62c25a0b09f5099
  Author: Internationalization Ro <i18nro at yahoo.com>
  Date:   2014-09-27 (Sat, 27 Sep 2014)

  Changed paths:
    M po/ro.po

  Log Message:
  -----------
  Translated using Weblate (Romanian)

Currently translated at 62.4% (1729 of 2768)

[ci skip]

  Commit: d21b4c03fd397d3a6b6fcefd8af04de08b3a74ee
      https://github.com/phpmyadmin/phpmyadmin/commit/d21b4c03fd397d3a6b6fcefd8af04de08b3a74ee
  Author: Weblate <noreply at weblate.org>
  Date:   2014-09-27 (Sat, 27 Sep 2014)

  Changed paths:
    M ChangeLog
    M export.php
    M libraries/plugins/export/ExportPdf.class.php

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

  Commit: 58cc1e5ae2107740173c3734246e2f71b5360c87
      https://github.com/phpmyadmin/phpmyadmin/commit/58cc1e5ae2107740173c3734246e2f71b5360c87
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-30 (Tue, 30 Sep 2014)

  Changed paths:
    M ChangeLog
    M libraries/structure.lib.php

  Log Message:
  -----------
  bug #4543 Changing column name can break saved "order by" clause

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: 179285bb616b8eaa3dda5a625a572843aba1d9e6
      https://github.com/phpmyadmin/phpmyadmin/commit/179285bb616b8eaa3dda5a625a572843aba1d9e6
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M ChangeLog
    M js/functions.js
    M js/navigation.js

  Log Message:
  -----------
  bug fix #4545

Signed-off-by: Smita Kumari <kumarismita62 at gmail.com>

  Commit: 34682045bd7c89806a99ced8aa352b3a966c2c9f
      https://github.com/phpmyadmin/phpmyadmin/commit/34682045bd7c89806a99ced8aa352b3a966c2c9f
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M ChangeLog
    M js/functions.js
    M js/navigation.js

  Log Message:
  -----------
  Merge pull request #1364 from smita786/QA_4_2

Fix bug #4545

  Commit: dbdd90511bcb24fefcf2b88f12bd342d4abef9b2
      https://github.com/phpmyadmin/phpmyadmin/commit/dbdd90511bcb24fefcf2b88f12bd342d4abef9b2
  Author: Robert Readman <robert_readman at hotmail.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M po/en_GB.po

  Log Message:
  -----------
  Translated using Weblate (English (United Kingdom))

Currently translated at 90.1% (2494 of 2768)

[ci skip]

  Commit: a020eac11a26977295cf2439ddd2e5b4af2c88fe
      https://github.com/phpmyadmin/phpmyadmin/commit/a020eac11a26977295cf2439ddd2e5b4af2c88fe
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M js/config.js
    M js/db_operations.js
    M js/db_search.js
    M js/db_structure.js
    M js/functions.js
    M js/gis_data_editor.js
    M js/indexes.js
    M js/makegrid.js
    M js/navigation.js
    M js/server_databases.js
    M js/server_privileges.js
    M js/server_status_monitor.js
    M js/server_variables.js
    M js/tbl_chart.js
    M js/tbl_relation.js
    M js/tbl_select.js
    M js/tbl_structure.js
    M js/tbl_zoom_plot_jqplot.js

  Log Message:
  -----------
  Add js checks in multiple files if data is undefined

Signed-off-by: Atul Pratap Singh <atulpratapsingh05 at gmail.com>

  Commit: ba37e2641abac6c637dffc410aebbd9c7dbcf7c1
      https://github.com/phpmyadmin/phpmyadmin/commit/ba37e2641abac6c637dffc410aebbd9c7dbcf7c1
  Author: Robert Readman <robert_readman at hotmail.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M po/en_GB.po

  Log Message:
  -----------
  Translated using Weblate (English (United Kingdom))

Currently translated at 100.0% (2768 of 2768)

[ci skip]

  Commit: 01c7f4e3f1433fb7365413f4e8dc5fea57e8fd76
      https://github.com/phpmyadmin/phpmyadmin/commit/01c7f4e3f1433fb7365413f4e8dc5fea57e8fd76
  Author: Weblate <noreply at weblate.org>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M js/config.js
    M js/db_operations.js
    M js/db_search.js
    M js/db_structure.js
    M js/functions.js
    M js/gis_data_editor.js
    M js/indexes.js
    M js/makegrid.js
    M js/navigation.js
    M js/server_databases.js
    M js/server_privileges.js
    M js/server_status_monitor.js
    M js/server_variables.js
    M js/tbl_chart.js
    M js/tbl_relation.js
    M js/tbl_select.js
    M js/tbl_structure.js
    M js/tbl_zoom_plot_jqplot.js

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

  Commit: 6c9c0b5dbfdd97dd4ee7664df6dcc729ac20676c
      https://github.com/phpmyadmin/phpmyadmin/commit/6c9c0b5dbfdd97dd4ee7664df6dcc729ac20676c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M libraries/TableSearch.class.php
    M libraries/Util.class.php

  Log Message:
  -----------
  [security] XSS with malicious ENUM values

Signed-off-by: Marc Delisle <marc at infomarc.info>

Conflicts:
	libraries/Util.class.php

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: 9cb2f3e29ea7854006b932cab1c2e45767b23f88
      https://github.com/phpmyadmin/phpmyadmin/commit/9cb2f3e29ea7854006b932cab1c2e45767b23f88
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M libraries/TableSearch.class.php

  Log Message:
  -----------
  Bug 4544: additional fix for 4.2.x

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: 43ec83fbdaa1925a89ce9f187d1e8577593a4899
      https://github.com/phpmyadmin/phpmyadmin/commit/43ec83fbdaa1925a89ce9f187d1e8577593a4899
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M ChangeLog
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  bug #4259 reCaptcha sound session expired problem

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>

  Commit: 48b601d5acaec3488786183c88c47ee4dccfd85b
      https://github.com/phpmyadmin/phpmyadmin/commit/48b601d5acaec3488786183c88c47ee4dccfd85b
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M po/et.po

  Log Message:
  -----------
  Translated using Weblate (Estonian)

Currently translated at 100.0% (2768 of 2768)

[ci skip]

  Commit: b00263748592eb630128c3f0f9a3974249f11406
      https://github.com/phpmyadmin/phpmyadmin/commit/b00263748592eb630128c3f0f9a3974249f11406
  Author: Weblate <noreply at weblate.org>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M ChangeLog
    M libraries/plugins/auth/AuthenticationCookie.class.php

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

  Commit: b7f8b8b74b8760b3e0d048fb27693d0125465397
      https://github.com/phpmyadmin/phpmyadmin/commit/b7f8b8b74b8760b3e0d048fb27693d0125465397
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M README.rst
    M doc/faq.rst
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/gl.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/km.po
    M po/kn.po
    M po/ko.po
    M po/ksh.po
    M po/ky.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/nl.po
    M po/pa.po
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/sr at latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/uz at latin.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po

  Log Message:
  -----------
  Switch translation server to hosted Weblate

Signed-off-by: Michal Čihař <michal at cihar.com>

  Commit: 600095570968d84c8acbf1431be4a23268cd5481
      https://github.com/phpmyadmin/phpmyadmin/commit/600095570968d84c8acbf1431be4a23268cd5481
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M po/fr.po

  Log Message:
  -----------
  Translated using Weblate (French)

Currently translated at 100.0% (2768 of 2768)

[ci skip]

  Commit: 02a0680684c520cec21435100175ddd51c9e06ca
      https://github.com/phpmyadmin/phpmyadmin/commit/02a0680684c520cec21435100175ddd51c9e06ca
  Author: Internationalization Ro <i18nro at yahoo.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M po/ro.po

  Log Message:
  -----------
  Translated using Weblate (Romanian)

Currently translated at 62.4% (1729 of 2768)

[ci skip]

  Commit: 408462c53b9c67c305ed39f21b35ca050acce040
      https://github.com/phpmyadmin/phpmyadmin/commit/408462c53b9c67c305ed39f21b35ca050acce040
  Author: Peter Dave Hello <xs910203 at gmail.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M po/zh_TW.po

  Log Message:
  -----------
  Translated using Weblate (Traditional Chinese)

Currently translated at 99.9% (2766 of 2768 strings)

[CI skip]

  Commit: 0677cc13477905121e8c34099a45c9795b06285e
      https://github.com/phpmyadmin/phpmyadmin/commit/0677cc13477905121e8c34099a45c9795b06285e
  Author: Xavier Navarro <xvnavarro at gmail.com>
  Date:   2014-10-05 (Sun, 05 Oct 2014)

  Changed paths:
    M po/ca.po

  Log Message:
  -----------
  Translated using Weblate (Catalan)

Currently translated at 85.9% (2378 of 2768 strings)

[CI skip]

  Commit: ebcac5adeb505979c48b35be7fb9aab6a3e1fd82
      https://github.com/phpmyadmin/phpmyadmin/commit/ebcac5adeb505979c48b35be7fb9aab6a3e1fd82
  Author: Purodha <publi at web.de>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

  Changed paths:
    M po/ksh.po

  Log Message:
  -----------
  Translated using Weblate (Colognian)

Currently translated at 1.0% (30 of 2768 strings)

[CI skip]

  Commit: 2079e9cd9abf4d76e50494ce4bf8f7c1d4999164
      https://github.com/phpmyadmin/phpmyadmin/commit/2079e9cd9abf4d76e50494ce4bf8f7c1d4999164
  Author: Burak Yavuz <hitowerdigit at hotmail.com>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

  Changed paths:
    M po/tr.po

  Log Message:
  -----------
  Translated using Weblate (Turkish)

Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]

  Commit: 48b97ecd064402134531af15124cb7d79c1f2e27
      https://github.com/phpmyadmin/phpmyadmin/commit/48b97ecd064402134531af15124cb7d79c1f2e27
  Author: Madhura Jayaratne <madhura.cj at 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 at gmail.com>

  Commit: 5db5f2a6d30ba985c0899e3174b8eedd06bfd62c
      https://github.com/phpmyadmin/phpmyadmin/commit/5db5f2a6d30ba985c0899e3174b8eedd06bfd62c
  Author: Alexey Rubinov <orion1979 at 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: 2936feaad23f361c708e7d3a66b8f63496b5ff66
      https://github.com/phpmyadmin/phpmyadmin/commit/2936feaad23f361c708e7d3a66b8f63496b5ff66
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M ChangeLog
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  #4548 Inline editing a field converts tab to spaces

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>

  Commit: a82cb7aeae35d6f9ad5ffb95216a4b444ac020dc
      https://github.com/phpmyadmin/phpmyadmin/commit/a82cb7aeae35d6f9ad5ffb95216a4b444ac020dc
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M po/ru.po

  Log Message:
  -----------
  Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2

  Commit: b240909757a8bb35145ae774e2758e9897ee3e00
      https://github.com/phpmyadmin/phpmyadmin/commit/b240909757a8bb35145ae774e2758e9897ee3e00
  Author: P <plamen_mbx at 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/718d02272b02d2616547f510fc8fce14401a262a
  Author: josep constanti <jconstanti at 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/3ffcbcb52ba296c096697ac754727ae331a1e39a
  Author: Xosé Calvo <xosecalvo at 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/27ab463b9b0b655ba97db1cc0fab0e28335460b8
  Author: Alexey Rubinov <orion1979 at 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/eefd44a89b9f8b81cd026f31924f131905acaeb7
  Author: Weblate <noreply at 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/d2b9979d03baedf8ddf3543ea864fdbade917af8
  Author: Marc Delisle <marc at 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 at infomarc.info>

  Commit: c1b4895f57e8d1c303adaf543f8ca63631734ccd
      https://github.com/phpmyadmin/phpmyadmin/commit/c1b4895f57e8d1c303adaf543f8ca63631734ccd
  Author: Michael Koch <michael.koch at enough.de>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M po/de.po

  Log Message:
  -----------
  Translated using Weblate (German)

Currently translated at 95.2% (2636 of 2768 strings)

[CI skip]

  Commit: 465d672fb027315a8fcba4e7a8a36aae88346a66
      https://github.com/phpmyadmin/phpmyadmin/commit/465d672fb027315a8fcba4e7a8a36aae88346a66
  Author: Weblate <noreply at weblate.org>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M ChangeLog
    M libraries/Util.class.php

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

  Commit: e93e128510426e7cd348f562492664ce5f2b8184
      https://github.com/phpmyadmin/phpmyadmin/commit/e93e128510426e7cd348f562492664ce5f2b8184
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M ChangeLog
    M export.php
    M libraries/config.default.php
    M libraries/plugins/export/ExportXml.class.php

  Log Message:
  -----------
  Port 'bug #3120 Events are not exported when using xml' to QA_4_2

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>

  Commit: c77fafd0d170373f0e2a488d0731f681b610c1ec
      https://github.com/phpmyadmin/phpmyadmin/commit/c77fafd0d170373f0e2a488d0731f681b610c1ec
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M ChangeLog
    M libraries/Util.class.php
    M po/bg.po
    M po/ca.po
    M po/de.po
    M po/gl.po
    M po/ru.po

  Log Message:
  -----------
  Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>

  Commit: 01d6a06c5294cd71f503fbdd64b41d06b7558bc9
      https://github.com/phpmyadmin/phpmyadmin/commit/01d6a06c5294cd71f503fbdd64b41d06b7558bc9
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M libraries/dbi/DBIDummy.class.php

  Log Message:
  -----------
  Update Dummy DBI for tests

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>

  Commit: 536d4ef8453ca1d9a0f8ae10704886a551980b34
      https://github.com/phpmyadmin/phpmyadmin/commit/536d4ef8453ca1d9a0f8ae10704886a551980b34
  Author: Ashutosh Dhundhara <ashutoshdhundhara at yahoo.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M js/makegrid.js

  Log Message:
  -----------
  bug #4554 Grid-editing timestamp column forces datepicker.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara at yahoo.com>

  Commit: 92efd1f7e1ac67a35f6a60c3a85c0c37a48ceac6
      https://github.com/phpmyadmin/phpmyadmin/commit/92efd1f7e1ac67a35f6a60c3a85c0c37a48ceac6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M js/makegrid.js

  Log Message:
  -----------
  Merge pull request #1374 from ashutoshdhundhara/bug_4554

bug #4554 Grid-editing timestamp column forces datepicker.

  Commit: dc3cabd6545b2c379199710d261cf260531aa4ed
      https://github.com/phpmyadmin/phpmyadmin/commit/dc3cabd6545b2c379199710d261cf260531aa4ed
  Author: Michael Koch <michael.koch at enough.de>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M po/de.po

  Log Message:
  -----------
  Translated using Weblate (German)

Currently translated at 95.2% (2637 of 2768 strings)

[CI skip]

  Commit: 21032ab3b1ff8fe289747e876b2b3ac708dc899b
      https://github.com/phpmyadmin/phpmyadmin/commit/21032ab3b1ff8fe289747e876b2b3ac708dc899b
  Author: Weblate <noreply at weblate.org>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M js/makegrid.js

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

  Commit: de12f8359a0260dd1a2ddcf7f157c622e2709e63
      https://github.com/phpmyadmin/phpmyadmin/commit/de12f8359a0260dd1a2ddcf7f157c622e2709e63
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: cbcacb0f0a4c1d641aa4ea12e8fa31695dda3a75
      https://github.com/phpmyadmin/phpmyadmin/commit/cbcacb0f0a4c1d641aa4ea12e8fa31695dda3a75
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'MAINT_4_2_9' into QA_4_2

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>

  Commit: 04fb8a291be5ef3fb209d208ed06d042abf90717
      https://github.com/phpmyadmin/phpmyadmin/commit/04fb8a291be5ef3fb209d208ed06d042abf90717
  Author: josep constanti <jconstanti at ovi.com>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Changed paths:
    M po/ca.po

  Log Message:
  -----------
  Translated using Weblate (Catalan)

Currently translated at 86.5% (2395 of 2768 strings)

[CI skip]

  Commit: 6d34ce85436d52fddccb1fbf70390fae0a0843f4
      https://github.com/phpmyadmin/phpmyadmin/commit/6d34ce85436d52fddccb1fbf70390fae0a0843f4
  Author: Michael Koch <michael.koch at enough.de>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Changed paths:
    M po/de.po

  Log Message:
  -----------
  Translated using Weblate (German)

Currently translated at 99.2% (2746 of 2768 strings)

[CI skip]

  Commit: aebe78830e57d4795e71bdfc7627f97023c8db19
      https://github.com/phpmyadmin/phpmyadmin/commit/aebe78830e57d4795e71bdfc7627f97023c8db19
  Author: Burak Yavuz <hitowerdigit at hotmail.com>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Changed paths:
    M po/tr.po

  Log Message:
  -----------
  Translated using Weblate (Turkish)

Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]

  Commit: 3871584791445b575749e6d97f8ccf01476fa827
      https://github.com/phpmyadmin/phpmyadmin/commit/3871584791445b575749e6d97f8ccf01476fa827
  Author: Weblate <noreply at weblate.org>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Changed paths:
    M ChangeLog

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

  Commit: dc4d694bd48d3ba90d1f5aaef9b352192e4e4ec7
      https://github.com/phpmyadmin/phpmyadmin/commit/dc4d694bd48d3ba90d1f5aaef9b352192e4e4ec7
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M ChangeLog
    M libraries/navigation/NavigationTree.class.php

  Log Message:
  -----------
  bug #4556 Fast filters for tables, views etc. should be governed by NavigationTreeDisplayItemFilterMinimum

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>

  Commit: ef075ea270ee4e71342dcc6576c72357e3f7151c
      https://github.com/phpmyadmin/phpmyadmin/commit/ef075ea270ee4e71342dcc6576c72357e3f7151c
  Author: Michael Koch <michael.koch at enough.de>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M po/de.po

  Log Message:
  -----------
  Translated using Weblate (German)

Currently translated at 99.5% (2756 of 2768 strings)

[CI skip]

  Commit: d275e429c4527c7583379fda56fbeb18c608b481
      https://github.com/phpmyadmin/phpmyadmin/commit/d275e429c4527c7583379fda56fbeb18c608b481
  Author: 이 형진 <weblate at waitfor.net>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M po/ko.po

  Log Message:
  -----------
  Translated using Weblate (Korean)

Currently translated at 84.9% (2352 of 2768 strings)

[CI skip]

  Commit: 44f127c3186a8379f1bc8eca97a714cdd1b5c6b5
      https://github.com/phpmyadmin/phpmyadmin/commit/44f127c3186a8379f1bc8eca97a714cdd1b5c6b5
  Author: Weblate <noreply at weblate.org>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M ChangeLog
    M libraries/navigation/NavigationTree.class.php

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

  Commit: 319aac3c761142ab00e3e6016e594d4b84079efc
      https://github.com/phpmyadmin/phpmyadmin/commit/319aac3c761142ab00e3e6016e594d4b84079efc
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.2.10 release

Signed-off-by: Marc Delisle <marc at infomarc.info>

  Commit: b516d2b5ffbd9f4a0a8fd63a50e2370043dd4186
      https://github.com/phpmyadmin/phpmyadmin/commit/b516d2b5ffbd9f4a0a8fd63a50e2370043dd4186
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Changed paths:
    M ChangeLog
    M README
    M README.rst
    M doc/conf.py
    M doc/faq.rst
    M export.php
    M js/config.js
    M js/db_operations.js
    M js/db_search.js
    M js/db_structure.js
    M js/functions.js
    M js/gis_data_editor.js
    M js/indexes.js
    M js/makegrid.js
    M js/navigation.js
    M js/server_databases.js
    M js/server_privileges.js
    M js/server_status_monitor.js
    M js/server_variables.js
    M js/tbl_chart.js
    M js/tbl_relation.js
    M js/tbl_select.js
    M js/tbl_structure.js
    M js/tbl_zoom_plot_jqplot.js
    M libraries/Config.class.php
    M libraries/DisplayResults.class.php
    M libraries/TableSearch.class.php
    M libraries/Util.class.php
    M libraries/config.default.php
    M libraries/core.lib.php
    M libraries/dbi/DBIDummy.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/export/ExportPdf.class.php
    M libraries/plugins/export/ExportXml.class.php
    M libraries/structure.lib.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/gl.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/km.po
    M po/kn.po
    M po/ko.po
    M po/ksh.po
    M po/ky.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/nl.po
    M po/pa.po
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/sr at latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/uz at latin.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M test/classes/PMA_Theme_test.php

  Log Message:
  -----------
  Merge branch 'MAINT_4_2_10' into STABLE

  Commit: 45a120ba574c4d1d6285a7bdfd7b3d5ac8a2d9a7
      https://github.com/phpmyadmin/phpmyadmin/commit/45a120ba574c4d1d6285a7bdfd7b3d5ac8a2d9a7
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Log Message:
  -----------
  Merge commit 'ea91261a6242b9bff28d8eba8635139dddbd0d2a' into STABLE

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ea91261a6242...45a120ba574c