[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 70fbae: Merge commit '89d57f8'

Marc Delisle marc at infomarc.info
Fri Dec 5 16:39:47 CET 2014


  Branch: refs/heads/STABLE
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 70fbae31aa619d5974373a82d9379e53fafebbd7
      https://github.com/phpmyadmin/phpmyadmin/commit/70fbae31aa619d5974373a82d9379e53fafebbd7
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M libraries/plugins/export/ExportSql.class.php

  Log Message:
  -----------
  Merge commit '89d57f8'


  Commit: d3f4d1c2c3e04349071c374be210eabe701beac4
      https://github.com/phpmyadmin/phpmyadmin/commit/d3f4d1c2c3e04349071c374be210eabe701beac4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Log Message:
  -----------
  Merge commit '7c29ef9'


  Commit: b00afd54e779d7ba875543e5306169200ea0dfa2
      https://github.com/phpmyadmin/phpmyadmin/commit/b00afd54e779d7ba875543e5306169200ea0dfa2
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M ChangeLog

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


  Commit: a1c3801be3c9f07538c67ceaa866ec59e550317b
      https://github.com/phpmyadmin/phpmyadmin/commit/a1c3801be3c9f07538c67ceaa866ec59e550317b
  Author: கணேஷ் குமார் <GANESHTHEONE at gmail.com>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M po/ta.po

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

Currently translated at 39.5% (1174 of 2965)

[ci skip]


  Commit: 56a37323b954492d6bcdc39ca5df8c460a3b1799
      https://github.com/phpmyadmin/phpmyadmin/commit/56a37323b954492d6bcdc39ca5df8c460a3b1799
  Author: கணேஷ் குமார் <GANESHTHEONE at gmail.com>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M po/ta.po

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

Currently translated at 39.6% (1175 of 2965)

[ci skip]

உங்களுக்கு உண்மையிலேயே தேர்ந்தெடுத்த பயனர்(களை) திருப்பியளிக்க வேண்டுமா?


  Commit: 1587f4b74482d3ee36e37ec47ef330fb8d25b1ac
      https://github.com/phpmyadmin/phpmyadmin/commit/1587f4b74482d3ee36e37ec47ef330fb8d25b1ac
  Author: கணேஷ் குமார் <GANESHTHEONE at gmail.com>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M po/ta.po

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

Currently translated at 39.6% (1177 of 2965)

[ci skip]

சுருங்குறியை பயன்படுத்துக


  Commit: 3f03307b62283ce2aaaf96206b84a84e6cccb131
      https://github.com/phpmyadmin/phpmyadmin/commit/3f03307b62283ce2aaaf96206b84a84e6cccb131
  Author: கணேஷ் குமார் <GANESHTHEONE at gmail.com>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M po/ta.po

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

Currently translated at 39.7% (1178 of 2965)

[ci skip]

சரம் சுருங்குறியோடு சரிபார்த்து பொருந்துகிறது என உறுதிப்பட்டால் மட்டுமே சரத்தை உட்செருகும்.முதல் விருப்பம் சுருங்குறியாகும்.


  Commit: 80fddf495ef8675685e7f3550a177b661691491c
      https://github.com/phpmyadmin/phpmyadmin/commit/80fddf495ef8675685e7f3550a177b661691491c
  Author: கணேஷ் குமார் <GANESHTHEONE at gmail.com>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M po/ta.po

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

Currently translated at 39.7% (1179 of 2965)

[ci skip]

அமைப்பாக்கம் இல்லா முறைமை இயலசெய்க


  Commit: c79078aa25f22a4257ad9f325ef62b9b6e2bbe9e
      https://github.com/phpmyadmin/phpmyadmin/commit/c79078aa25f22a4257ad9f325ef62b9b6e2bbe9e
  Author: கணேஷ் குமார் <GANESHTHEONE at gmail.com>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M po/ta.po

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

Currently translated at 39.7% (1179 of 2965)

[ci skip]

அமைப்பாக்கம் இல்லா முறைமையை இயலசெய்க


  Commit: aa6dbfbe598f97b7876ace2e06c21ad623ce6791
      https://github.com/phpmyadmin/phpmyadmin/commit/aa6dbfbe598f97b7876ace2e06c21ad623ce6791
  Author: கணேஷ் குமார் <GANESHTHEONE at gmail.com>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M po/ta.po

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

Currently translated at 39.7% (1180 of 2965)

[ci skip]

ஒழுங்கமைவு செருகுநிரல்களை நினைவேற்ற இயலவில்லை, தயவுசெய்து உங்கள் நிறுவலை சரிபார்க்கவும்!


  Commit: f203366c8340d845ab29500ee46346fdf621862c
      https://github.com/phpmyadmin/phpmyadmin/commit/f203366c8340d845ab29500ee46346fdf621862c
  Author: கணேஷ் குமார் <GANESHTHEONE at gmail.com>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M po/ta.po

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

Currently translated at 39.8% (1182 of 2965)

[ci skip]

pmadbஇன் அமைப்பாக்கம்...


  Commit: 743cff338f09c3c9ba903e77058f179ae6b1fe8c
      https://github.com/phpmyadmin/phpmyadmin/commit/743cff338f09c3c9ba903e77058f179ae6b1fe8c
  Author: Marcus Ball <marcus.ball at live.com>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

  Changed paths:
    M libraries/display_change_password.lib.php

  Log Message:
  -----------
  Added basename() to fix path error when using reverse proxy or non-root directory installation

Signed-Off-By: Marcus Ball <marcus at marcusball.me>


  Commit: c2bcb4f8445dccfa86773cd75c19050437b860ca
      https://github.com/phpmyadmin/phpmyadmin/commit/c2bcb4f8445dccfa86773cd75c19050437b860ca
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M js/pmd/designer_db.js
    M js/pmd/designer_page.js
    M js/pmd/move.js

  Log Message:
  -----------
  Simplify callbacks

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


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

  Changed paths:
    M js/pmd/designer_db.js

  Log Message:
  -----------
  Use pma_ prefix

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


  Commit: e2f7257a2c380e67b70b340d9337da19a336f410
      https://github.com/phpmyadmin/phpmyadmin/commit/e2f7257a2c380e67b70b340d9337da19a336f410
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M js/messages.php
    M js/pmd/move.js
    M libraries/db_designer.lib.php
    M libraries/pmd_common.php

  Log Message:
  -----------
  Indicate save status

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


  Commit: a7b0fad97838f010cfbce46615ec75a1480a879c
      https://github.com/phpmyadmin/phpmyadmin/commit/a7b0fad97838f010cfbce46615ec75a1480a879c
  Author: கணேஷ் குமார் <GANESHTHEONE at gmail.com>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M po/ta.po

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

Currently translated at 39.8% (1183 of 2965)

[ci skip]

அயல் குறியெண் வரைமுறை %s கைவிடப்பட்டது.


  Commit: 8a3a358b2bce167b1307dd4b443a270d53e4d084
      https://github.com/phpmyadmin/phpmyadmin/commit/8a3a358b2bce167b1307dd4b443a270d53e4d084
  Author: Weblate <noreply at weblate.org>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M js/messages.php
    M js/pmd/designer_db.js
    M js/pmd/designer_page.js
    M js/pmd/move.js
    M libraries/db_designer.lib.php
    M libraries/pmd_common.php

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


  Commit: d116925725179b8d9e4df3b0718821e010a5c96c
      https://github.com/phpmyadmin/phpmyadmin/commit/d116925725179b8d9e4df3b0718821e010a5c96c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M libraries/display_change_password.lib.php

  Log Message:
  -----------
  Merge pull request #1341 from marcusball/master

Added basename() in  libraries/display_change_password.lib.php


  Commit: e2fb26726b235810e408f197d89bd75b1ad8cc5a
      https://github.com/phpmyadmin/phpmyadmin/commit/e2fb26726b235810e408f197d89bd75b1ad8cc5a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M ChangeLog

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

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


  Commit: f7f39347efcf56cd8297ea9435fd80c567546485
      https://github.com/phpmyadmin/phpmyadmin/commit/f7f39347efcf56cd8297ea9435fd80c567546485
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M test/classes/PMA_Util_test.php

  Log Message:
  -----------
  Fix coding style

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


  Commit: 761d0fa84ccf694272528e741b7e3c8799c2734f
      https://github.com/phpmyadmin/phpmyadmin/commit/761d0fa84ccf694272528e741b7e3c8799c2734f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M libraries/Message.class.php

  Log Message:
  -----------
  Fix parameter type

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


  Commit: 119ecb426899d9f370bd9840528cbd2d819f0e30
      https://github.com/phpmyadmin/phpmyadmin/commit/119ecb426899d9f370bd9840528cbd2d819f0e30
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M libraries/Message.class.php

  Log Message:
  -----------
  Fix coding style

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


  Commit: 551099bc93b9a20c232fc86facd3c244d89bb495
      https://github.com/phpmyadmin/phpmyadmin/commit/551099bc93b9a20c232fc86facd3c244d89bb495
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-23 (Sat, 23 Aug 2014)

  Changed paths:
    M libraries/sql_query_form.lib.php
    M test/classes/PMA_Config_test.php

  Log Message:
  -----------
  Fix coding style

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


  Commit: 32a77463a7340e0ff9562d6ec205219a6d789b80
      https://github.com/phpmyadmin/phpmyadmin/commit/32a77463a7340e0ff9562d6ec205219a6d789b80
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-23 (Sat, 23 Aug 2014)

  Changed paths:
    M libraries/tbl_columns_definition_form.lib.php

  Log Message:
  -----------
  Fix parameter type

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


  Commit: 79896a1c20abc8087811304cd6c725b7a064ca8e
      https://github.com/phpmyadmin/phpmyadmin/commit/79896a1c20abc8087811304cd6c725b7a064ca8e
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-23 (Sat, 23 Aug 2014)

  Changed paths:
    M libraries/Util.class.php

  Log Message:
  -----------
  Fix parameter type

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


  Commit: ec98368ec7cc628918f7a6e1334f9e4b30b800dc
      https://github.com/phpmyadmin/phpmyadmin/commit/ec98368ec7cc628918f7a6e1334f9e4b30b800dc
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-23 (Sat, 23 Aug 2014)

  Changed paths:
    M export.php

  Log Message:
  -----------
  Avoid warning from PHP Analyzer

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


  Commit: e5f1c6d8bfb47be6b856c86b4c20f0815a7ecbf6
      https://github.com/phpmyadmin/phpmyadmin/commit/e5f1c6d8bfb47be6b856c86b4c20f0815a7ecbf6
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M js/pmd/move.js
    M libraries/db_designer.lib.php
    M libraries/plugins/schema/Export_Relation_Schema.class.php
    M libraries/plugins/schema/TableStats.class.php
    M libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
    M libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
    M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
    M libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
    M schema_export.php
    M test/classes/schema/Pdf_Relation_Schema_test.php
    M test/libraries/PMA_designer_test.php

  Log Message:
  -----------
  Simplify schema exporting

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


  Commit: 681bca35602963ca813c1f2b1c290c3fd049f794
      https://github.com/phpmyadmin/phpmyadmin/commit/681bca35602963ca813c1f2b1c290c3fd049f794
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M ChangeLog
    M db_designer.php
    M export.php
    M js/messages.php
    M js/pmd/designer_db.js
    M js/pmd/designer_page.js
    M js/pmd/move.js
    M js/sql.js
    M js/tbl_chart.js
    M libraries/DatabaseInterface.class.php
    M libraries/Message.class.php
    M libraries/Util.class.php
    M libraries/bookmark.lib.php
    M libraries/db_designer.lib.php
    M libraries/display_change_password.lib.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
    M libraries/pmd_common.php
    M libraries/sql_query_form.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_relation.lib.php
    M po/ko.po
    M po/ta.po
    M po/uk.po
    M test/classes/PMA_Config_test.php
    M test/classes/PMA_Util_test.php

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


  Commit: 59f93153c539b4ff2784171ec445f65eba6fc64a
      https://github.com/phpmyadmin/phpmyadmin/commit/59f93153c539b4ff2784171ec445f65eba6fc64a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
    M libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
    M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
    M libraries/plugins/schema/svg/Svg_Relation_Schema.class.php

  Log Message:
  -----------
  Change confusing variable name

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


  Commit: 36f7b18ee17cd494f513837e1765435e35bfc673
      https://github.com/phpmyadmin/phpmyadmin/commit/36f7b18ee17cd494f513837e1765435e35bfc673
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M libraries/plugins/schema/svg/Svg_Relation_Schema.class.php

  Log Message:
  -----------
  Align docs

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


  Commit: 86ba7a95c0ac4d84aef0e4d5640c57a0a1cfece3
      https://github.com/phpmyadmin/phpmyadmin/commit/86ba7a95c0ac4d84aef0e4d5640c57a0a1cfece3
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
    M libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
    M libraries/plugins/schema/svg/Svg_Relation_Schema.class.php

  Log Message:
  -----------
  Append page number to file name only if it is set

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


  Commit: b5e87c6281d6cff7c1d972156d3f0cee58c67973
      https://github.com/phpmyadmin/phpmyadmin/commit/b5e87c6281d6cff7c1d972156d3f0cee58c67973
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php

  Log Message:
  -----------
  Use page number in filename

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


  Commit: dc8f2c560627614b1c19b0adcc901cc54aebc0f9
      https://github.com/phpmyadmin/phpmyadmin/commit/dc8f2c560627614b1c19b0adcc901cc54aebc0f9
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M js/pmd/designer_page.js
    M libraries/db_designer.lib.php
    M libraries/pmd_common.php

  Log Message:
  -----------
  Properly mark saved status for new pages

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


  Commit: 8c234c1b49f1dfcb874f958d0fbe11491fc18e89
      https://github.com/phpmyadmin/phpmyadmin/commit/8c234c1b49f1dfcb874f958d0fbe11491fc18e89
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Fix parameter type

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


  Commit: c33374e243093c2c186dc38e9d3dc5ff55e2fa9c
      https://github.com/phpmyadmin/phpmyadmin/commit/c33374e243093c2c186dc38e9d3dc5ff55e2fa9c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M test/classes/schema/Dia_Relation_Schema_test.php
    M test/classes/schema/Eps_Relation_Schema_test.php
    M test/classes/schema/Pdf_Relation_Schema_test.php
    M test/classes/schema/Svg_Relation_Schema_test.php

  Log Message:
  -----------
  Fix failing tests

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


  Commit: bd378db70d49fd8a7503a7e562c6616eda1a5ade
      https://github.com/phpmyadmin/phpmyadmin/commit/bd378db70d49fd8a7503a7e562c6616eda1a5ade
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M js/navigation.js

  Log Message:
  -----------
  Fix db fast filters

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


  Commit: ef3da7a79e7f3d9d1eed6470b0c03bbee7cf1028
      https://github.com/phpmyadmin/phpmyadmin/commit/ef3da7a79e7f3d9d1eed6470b0c03bbee7cf1028
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M test/classes/schema/Pdf_Relation_Schema_test.php

  Log Message:
  -----------
  Fix more failing tests

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


  Commit: a908121b594d341b7a3487b918be049def65bd26
      https://github.com/phpmyadmin/phpmyadmin/commit/a908121b594d341b7a3487b918be049def65bd26
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M test/classes/schema/Pdf_Relation_Schema_test.php

  Log Message:
  -----------
  Fix more failing tests


  Commit: 7ee56a7d606ff2994f8024780367a77415c8b278
      https://github.com/phpmyadmin/phpmyadmin/commit/7ee56a7d606ff2994f8024780367a77415c8b278
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M libraries/tbl_relation.lib.php

  Log Message:
  -----------
  Add test before using htmlspecialchars()

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


  Commit: 12ceeed2d073628861f0ca015e29b9f2acc825fc
      https://github.com/phpmyadmin/phpmyadmin/commit/12ceeed2d073628861f0ca015e29b9f2acc825fc
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-24 (Sun, 24 Aug 2014)

  Changed paths:
    M db_printview.php
    A libraries/db_printview.lib.php

  Log Message:
  -----------
  Refactoring db print view

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


  Commit: 4e13d2270394b35ee8af5c7eb44ccb0930789712
      https://github.com/phpmyadmin/phpmyadmin/commit/4e13d2270394b35ee8af5c7eb44ccb0930789712
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M libraries/select_lang.lib.php
    A po/ne.po

  Log Message:
  -----------
  Add Nepali language

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


  Commit: 6c6a25ea694f2f0b47a874e2639535d331e93cae
      https://github.com/phpmyadmin/phpmyadmin/commit/6c6a25ea694f2f0b47a874e2639535d331e93cae
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

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

Conflicts:
	test/classes/schema/Pdf_Relation_Schema_test.php


  Commit: 6cadd6ef3190fdde7b627f59d9f04e6913b920f0
      https://github.com/phpmyadmin/phpmyadmin/commit/6cadd6ef3190fdde7b627f59d9f04e6913b920f0
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M db_operations.php
    M index.php

  Log Message:
  -----------
  Improve messages

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


  Commit: 0494644aa47e2f03c775185a9b27d80de9662864
      https://github.com/phpmyadmin/phpmyadmin/commit/0494644aa47e2f03c775185a9b27d80de9662864
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    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/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    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:
  -----------
  Update po files


  Commit: 9cedf0a58feaad7604cdf7d09828854c11c630e6
      https://github.com/phpmyadmin/phpmyadmin/commit/9cedf0a58feaad7604cdf7d09828854c11c630e6
  Author: Burak Yavuz <hitowerdigit at hotmail.com>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M po/tr.po

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

Currently translated at 100.0% (2962 of 2962)

[ci skip]


  Commit: 33c23aeb5b0e061fca262a571d2113555fe0a951
      https://github.com/phpmyadmin/phpmyadmin/commit/33c23aeb5b0e061fca262a571d2113555fe0a951
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M po/fr.po

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

Currently translated at 100.0% (2962 of 2962)

[ci skip]


  Commit: db229c0aa86440593931e0eaedf6d4bdfba2466a
      https://github.com/phpmyadmin/phpmyadmin/commit/db229c0aa86440593931e0eaedf6d4bdfba2466a
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M po/nl.po

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

Currently translated at 98.4% (2915 of 2962)

[ci skip]


  Commit: 407c0493d83c88593233f3d6c565d4c2c955cd7b
      https://github.com/phpmyadmin/phpmyadmin/commit/407c0493d83c88593233f3d6c565d4c2c955cd7b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

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

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


  Commit: e039d3dbd3c30446c1f288f20c5c5ee23b10f757
      https://github.com/phpmyadmin/phpmyadmin/commit/e039d3dbd3c30446c1f288f20c5c5ee23b10f757
  Author: Giovanni Sora <g.sora at tiscali.it>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

  Changed paths:
    M po/ia.po

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

Currently translated at 61.4% (1820 of 2962)

[ci skip]


  Commit: ff8807375531067a58b0149fc4aa7bca57c04aba
      https://github.com/phpmyadmin/phpmyadmin/commit/ff8807375531067a58b0149fc4aa7bca57c04aba
  Author: Weblate <noreply at weblate.org>
  Date:   2014-08-25 (Mon, 25 Aug 2014)

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

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


  Commit: 8ada670235e6093d91fedd0a72e54cc4c5993fcd
      https://github.com/phpmyadmin/phpmyadmin/commit/8ada670235e6093d91fedd0a72e54cc4c5993fcd
  Author: Domen <mitenem at outlook.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M po/sl.po

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

Currently translated at 100.0% (2962 of 2962)

[ci skip]


  Commit: 4406e045b4f2bc93fec651dc344de61ab5b2864b
      https://github.com/phpmyadmin/phpmyadmin/commit/4406e045b4f2bc93fec651dc344de61ab5b2864b
  Author: Matías Bellone <matiasbellone+weblate at gmail.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M po/es.po

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

Currently translated at 100.0% (2962 of 2962)

[ci skip]


  Commit: 042fc65a9d8b4d62a0d5d1bda70b805aef920153
      https://github.com/phpmyadmin/phpmyadmin/commit/042fc65a9d8b4d62a0d5d1bda70b805aef920153
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M po/et.po

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

Currently translated at 100.0% (2962 of 2962)

[ci skip]


  Commit: 17a56337c539358c6ec7f4f4c1755e4cb228eb4a
      https://github.com/phpmyadmin/phpmyadmin/commit/17a56337c539358c6ec7f4f4c1755e4cb228eb4a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M libraries/db_designer.lib.php

  Log Message:
  -----------
  Value of the passed parameter is 'editPage'

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


  Commit: 94961e8e5c721a5c6520ab7ad5f2d645fd30c1a3
      https://github.com/phpmyadmin/phpmyadmin/commit/94961e8e5c721a5c6520ab7ad5f2d645fd30c1a3
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M db_designer.php

  Log Message:
  -----------
  Remove spaces

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


  Commit: 0241cba09bea59d29fdfae9ee319121403c1d4b7
      https://github.com/phpmyadmin/phpmyadmin/commit/0241cba09bea59d29fdfae9ee319121403c1d4b7
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Log Message:
  -----------
  Merge commit 'ae88c8d'


  Commit: 3e891622d2c48ee97a11dd0d2104db3affcb9a7d
      https://github.com/phpmyadmin/phpmyadmin/commit/3e891622d2c48ee97a11dd0d2104db3affcb9a7d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Log Message:
  -----------
  Merge commit '5b749b8'


  Commit: ab46427606cdbf6818f4c6c153817a092488bb88
      https://github.com/phpmyadmin/phpmyadmin/commit/ab46427606cdbf6818f4c6c153817a092488bb88
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M libraries/tbl_relation.lib.php

  Log Message:
  -----------
  Fix merge conflict

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


  Commit: 0c7777733e8a76567c0b82858aafc8116e8bab6c
      https://github.com/phpmyadmin/phpmyadmin/commit/0c7777733e8a76567c0b82858aafc8116e8bab6c
  Author: Nabin Ghimire <nnabinn at hotmail.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M po/ne.po

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

Currently translated at 1.4% (42 of 2962)

[ci skip]


  Commit: c814159c9c4d30bd14d8f6396f3a42b4bff4a140
      https://github.com/phpmyadmin/phpmyadmin/commit/c814159c9c4d30bd14d8f6396f3a42b4bff4a140
  Author: Alex Smirnov <alex-smirnov at mail.ru>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M po/ru.po

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

Currently translated at 99.7% (2954 of 2962)

[ci skip]


  Commit: 1c3ce48692b426d49b594be780d833ff434ac8af
      https://github.com/phpmyadmin/phpmyadmin/commit/1c3ce48692b426d49b594be780d833ff434ac8af
  Author: Weblate <noreply at weblate.org>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M libraries/tbl_relation.lib.php

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


  Commit: b520496b5ce8712a7d67023c41ef0c158d42eca2
      https://github.com/phpmyadmin/phpmyadmin/commit/b520496b5ce8712a7d67023c41ef0c158d42eca2
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M libraries/db_designer.lib.php

  Log Message:
  -----------
  Fix typo

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


  Commit: 72a9acd46945660e94b68dd6b12d85dde6f5d4fe
      https://github.com/phpmyadmin/phpmyadmin/commit/72a9acd46945660e94b68dd6b12d85dde6f5d4fe
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M po/ne.po
    M po/ru.po

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: 03f3ad81444f292c2243dd3cc9395e4524ed7cbb
      https://github.com/phpmyadmin/phpmyadmin/commit/03f3ad81444f292c2243dd3cc9395e4524ed7cbb
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M db_designer.php
    M libraries/db_designer.lib.php

  Log Message:
  -----------
  Hide PDF page related icon in visual builder

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


  Commit: 8d95c4ec4f272b11d217615b1dfe503ebb89e655
      https://github.com/phpmyadmin/phpmyadmin/commit/8d95c4ec4f272b11d217615b1dfe503ebb89e655
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M libraries/db_designer.lib.php
    M libraries/tbl_relation.lib.php
    M po/ne.po
    M po/ru.po

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


  Commit: 7969336d04177cd58cc1e4fc7210ee99bedb9d49
      https://github.com/phpmyadmin/phpmyadmin/commit/7969336d04177cd58cc1e4fc7210ee99bedb9d49
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M ChangeLog
    M doc/config.rst
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/sql.lib.php

  Log Message:
  -----------
  rfe-1502 : Smart sorting for int keys

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


  Commit: 531dac478430b67ec0d03439fc67c0039ba84dd3
      https://github.com/phpmyadmin/phpmyadmin/commit/531dac478430b67ec0d03439fc67c0039ba84dd3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M libraries/url_generating.lib.php

  Log Message:
  -----------
  Fix coding style

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


  Commit: bd38f699e07588f546b39203230cc007e3fe6959
      https://github.com/phpmyadmin/phpmyadmin/commit/bd38f699e07588f546b39203230cc007e3fe6959
  Author: Nabin Ghimire <nnabinn at hotmail.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M po/ne.po

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

Currently translated at 1.8% (54 of 2962)

[ci skip]


  Commit: 2fcba195ec6715de90acb247e3d7b42294b20c97
      https://github.com/phpmyadmin/phpmyadmin/commit/2fcba195ec6715de90acb247e3d7b42294b20c97
  Author: Weblate <noreply at weblate.org>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M libraries/url_generating.lib.php

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


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

  Changed paths:
    M ChangeLog
    M doc/config.rst
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/sql.lib.php

  Log Message:
  -----------
  Merge pull request #1343 from Chanaka/RFE-1502

rfe-1502 : Smart sorting for int keys


  Commit: 4888250b5b65127723b355a1b8b365f6d7f3686f
      https://github.com/phpmyadmin/phpmyadmin/commit/4888250b5b65127723b355a1b8b365f6d7f3686f
  Author: Chien Wei Lin <cwlin0416 at gmail.com>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M po/zh_TW.po

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

Currently translated at 98.3% (2913 of 2962)

[ci skip]


  Commit: cec61325a3b37d12a654e692a30ee209b89f347a
      https://github.com/phpmyadmin/phpmyadmin/commit/cec61325a3b37d12a654e692a30ee209b89f347a
  Author: Burak Yavuz <hitowerdigit at hotmail.com>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M po/tr.po

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

Currently translated at 100.0% (2962 of 2962)

[ci skip]


  Commit: 6a8619e59f3e657a1bcc39165ab17321748a549a
      https://github.com/phpmyadmin/phpmyadmin/commit/6a8619e59f3e657a1bcc39165ab17321748a549a
  Author: Weblate <noreply at weblate.org>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M ChangeLog
    M doc/config.rst
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/sql.lib.php

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


  Commit: 0ce81cfcea4fd23e0a1d731ea51540e059ffb79a
      https://github.com/phpmyadmin/phpmyadmin/commit/0ce81cfcea4fd23e0a1d731ea51540e059ffb79a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M libraries/config/messages.inc.php

  Log Message:
  -----------
  Improve messages

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


  Commit: 8c89232f1d03e35b3bce1c4af2a4ebe02f177f92
      https://github.com/phpmyadmin/phpmyadmin/commit/8c89232f1d03e35b3bce1c4af2a4ebe02f177f92
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Fix coding style

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


  Commit: 98c9604b9ccd0cdf46304f6448ca1499c8cab480
      https://github.com/phpmyadmin/phpmyadmin/commit/98c9604b9ccd0cdf46304f6448ca1499c8cab480
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M po/tr.po
    M po/zh_TW.po

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: 76218526544392c44b0ce0671533f46616734e42
      https://github.com/phpmyadmin/phpmyadmin/commit/76218526544392c44b0ce0671533f46616734e42
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    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/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    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:
  -----------
  Update po files


  Commit: d0e0ed047816fa84ce213df88be75670c765eeb5
      https://github.com/phpmyadmin/phpmyadmin/commit/d0e0ed047816fa84ce213df88be75670c765eeb5
  Author: Burak Yavuz <hitowerdigit at hotmail.com>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M po/tr.po

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

Currently translated at 100.0% (2964 of 2964)

[ci skip]


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

  Log Message:
  -----------
  Merge commit '58e4568'


  Commit: 8e9f1bec218dc0012359ad34f22d152d2d8a63e9
      https://github.com/phpmyadmin/phpmyadmin/commit/8e9f1bec218dc0012359ad34f22d152d2d8a63e9
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M libraries/plugins/export/ExportSql.class.php

  Log Message:
  -----------
  Merge commit '83e90ae'


  Commit: 564f50f399758f669a25693461ba1d6c88eacf01
      https://github.com/phpmyadmin/phpmyadmin/commit/564f50f399758f669a25693461ba1d6c88eacf01
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Log Message:
  -----------
  Merge commit 'd789ee4'


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge commit '3a9e2bb'


  Commit: d1f3f208f78ecd6f9ec7c87040c7eb9e2cce03b7
      https://github.com/phpmyadmin/phpmyadmin/commit/d1f3f208f78ecd6f9ec7c87040c7eb9e2cce03b7
  Author: Helder Santana <helder.bs.santana at gmail.com>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M po/pt_BR.po

  Log Message:
  -----------
  Translated using Weblate (Portuguese (Brazil))

Currently translated at 93.6% (2777 of 2964)

[ci skip]


  Commit: 5bf1af58a0019f9ed69816a9c402d437617be7a7
      https://github.com/phpmyadmin/phpmyadmin/commit/5bf1af58a0019f9ed69816a9c402d437617be7a7
  Author: Weblate <noreply at weblate.org>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

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

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


  Commit: 93d6508dd59bc24af023e971e21b654c784c38e3
      https://github.com/phpmyadmin/phpmyadmin/commit/93d6508dd59bc24af023e971e21b654c784c38e3
  Author: Panagiotis Papazoglou <papaz_p at yahoo.com>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M po/el.po

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

Currently translated at 100.0% (2964 of 2964)

[ci skip]


  Commit: 9795cccb2b162151729cf7b456aa8a6b8d2efb54
      https://github.com/phpmyadmin/phpmyadmin/commit/9795cccb2b162151729cf7b456aa8a6b8d2efb54
  Author: Domen <mitenem at outlook.com>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M po/sl.po

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

Currently translated at 100.0% (2964 of 2964)

[ci skip]


  Commit: 6fa68700f373cef1be02641053608eb2f3f8df0a
      https://github.com/phpmyadmin/phpmyadmin/commit/6fa68700f373cef1be02641053608eb2f3f8df0a
  Author: Matías Bellone <matiasbellone+weblate at gmail.com>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M po/es.po

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

Currently translated at 100.0% (2964 of 2964)

[ci skip]


  Commit: ab9d130a434c57320b2c3e96e3fd0485c27d0974
      https://github.com/phpmyadmin/phpmyadmin/commit/ab9d130a434c57320b2c3e96e3fd0485c27d0974
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M po/et.po

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

Currently translated at 100.0% (2964 of 2964)

[ci skip]


  Commit: 31c1f6e70f25bfa94cec5ebcfa671059eac1f74e
      https://github.com/phpmyadmin/phpmyadmin/commit/31c1f6e70f25bfa94cec5ebcfa671059eac1f74e
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M libraries/plugins/export/ExportSql.class.php

  Log Message:
  -----------
  Merge commit 'fed4664'


  Commit: 7beeab615dbdf310d01f7234473096a4b307f3b9
      https://github.com/phpmyadmin/phpmyadmin/commit/7beeab615dbdf310d01f7234473096a4b307f3b9
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Log Message:
  -----------
  Merge commit '5c11862'


  Commit: d50c7f04b897e7b871e4a05c1935ebaafbda3937
      https://github.com/phpmyadmin/phpmyadmin/commit/d50c7f04b897e7b871e4a05c1935ebaafbda3937
  Author: Giovanni Sora <g.sora at tiscali.it>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M po/ia.po

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

Currently translated at 61.4% (1821 of 2964)

[ci skip]


  Commit: 654d9ebee52c032f9f7420754cca3b5f9ee9255f
      https://github.com/phpmyadmin/phpmyadmin/commit/654d9ebee52c032f9f7420754cca3b5f9ee9255f
  Author: Alex Smirnov <alex-smirnov at mail.ru>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M po/ru.po

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

Currently translated at 99.7% (2956 of 2964)

[ci skip]


  Commit: f0867e9c4b6abb8c502a2101f8a45ee4ab70ab18
      https://github.com/phpmyadmin/phpmyadmin/commit/f0867e9c4b6abb8c502a2101f8a45ee4ab70ab18
  Author: Weblate <noreply at weblate.org>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M libraries/plugins/export/ExportSql.class.php

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


  Commit: 10c075239cbc799917ac195869e651b49971324d
      https://github.com/phpmyadmin/phpmyadmin/commit/10c075239cbc799917ac195869e651b49971324d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M po/fr.po

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

Currently translated at 100.0% (2964 of 2964)

[ci skip]


  Commit: e3fb12e385498cf6121bee733fbc033f5818a2c5
      https://github.com/phpmyadmin/phpmyadmin/commit/e3fb12e385498cf6121bee733fbc033f5818a2c5
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M test/classes/plugin/export/PMA_ExportSql_test.php

  Log Message:
  -----------
  Merge commit '3b479f5'


  Commit: 9f971f30875590c5f350b01bff7f913b92f5e9ad
      https://github.com/phpmyadmin/phpmyadmin/commit/9f971f30875590c5f350b01bff7f913b92f5e9ad
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Log Message:
  -----------
  Merge commit '74ae4a2'


  Commit: 92335f8582e0e82959e3dad71c931efe4a192f6a
      https://github.com/phpmyadmin/phpmyadmin/commit/92335f8582e0e82959e3dad71c931efe4a192f6a
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database.class.php

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


  Commit: 6cd19738cd645aa4693b03c3a2f392cdecbeafe6
      https://github.com/phpmyadmin/phpmyadmin/commit/6cd19738cd645aa4693b03c3a2f392cdecbeafe6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M ChangeLog
    M js/server_privileges.js

  Log Message:
  -----------
  Fix merge conflict

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


  Commit: 208adc20ee71c01975cb924e2439243a5d1ce0df
      https://github.com/phpmyadmin/phpmyadmin/commit/208adc20ee71c01975cb924e2439243a5d1ce0df
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M libraries/plugins/import/ImportCsv.class.php
    M libraries/plugins/import/ImportOds.class.php

  Log Message:
  -----------
  Merge commit '5f2adcb'


  Commit: b23c9b9504a83e5d4ef7af9b7ea8565430d52c42
      https://github.com/phpmyadmin/phpmyadmin/commit/b23c9b9504a83e5d4ef7af9b7ea8565430d52c42
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Log Message:
  -----------
  Merge commit '54f80bf'


  Commit: 5a405950108e213546f9c82a2f2cbe69be1e0093
      https://github.com/phpmyadmin/phpmyadmin/commit/5a405950108e213546f9c82a2f2cbe69be1e0093
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge commit '5cdd9f4'


  Commit: 7c74053c1586d18d750312af156bc831aaf74dc7
      https://github.com/phpmyadmin/phpmyadmin/commit/7c74053c1586d18d750312af156bc831aaf74dc7
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M libraries/plugins/import/ImportCsv.class.php

  Log Message:
  -----------
  Remove dead assignments

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


  Commit: 6843e19368414dca1edbdbdfb5e53ddaf1983f51
      https://github.com/phpmyadmin/phpmyadmin/commit/6843e19368414dca1edbdbdfb5e53ddaf1983f51
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M libraries/mult_submits.lib.php

  Log Message:
  -----------
  Remove dead code

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


  Commit: 79363e9c4a3a467b069f498efaad858fb1c7cc25
      https://github.com/phpmyadmin/phpmyadmin/commit/79363e9c4a3a467b069f498efaad858fb1c7cc25
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

  Changed paths:
    M ChangeLog

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


  Commit: 1d5d236de345d35febfe0289898083f142deb16b
      https://github.com/phpmyadmin/phpmyadmin/commit/1d5d236de345d35febfe0289898083f142deb16b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Fix parameter type

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


  Commit: 792a8d324449f63de7a4f91cd1fa491023a4aba3
      https://github.com/phpmyadmin/phpmyadmin/commit/792a8d324449f63de7a4f91cd1fa491023a4aba3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

  Changed paths:
    M libraries/core.lib.php
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Fix typo

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


  Commit: 6e0189ba74fcd5b74ac77d617afafaeba51bd0f3
      https://github.com/phpmyadmin/phpmyadmin/commit/6e0189ba74fcd5b74ac77d617afafaeba51bd0f3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

  Changed paths:
    M ChangeLog
    M js/functions.js

  Log Message:
  -----------
  Fix merge conflict

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


  Commit: 4960f208e20ad7fd8b77cef9dcc82772c29def92
      https://github.com/phpmyadmin/phpmyadmin/commit/4960f208e20ad7fd8b77cef9dcc82772c29def92
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

  Changed paths:
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  Add PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 20ab54ac9a21acb875a295906a9ad948050688fc
      https://github.com/phpmyadmin/phpmyadmin/commit/20ab54ac9a21acb875a295906a9ad948050688fc
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Changed paths:
    M build.xml
    M composer.json

  Log Message:
  -----------
  use phpunit 4.1.x for testing

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: f7610b37dc4f2d8f04fc0a92fcc27428c31d3675
      https://github.com/phpmyadmin/phpmyadmin/commit/f7610b37dc4f2d8f04fc0a92fcc27428c31d3675
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  install composer packages for hhvm also

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: 91a66bf5ef10eada07c7056b05d3aa8646ece6dc
      https://github.com/phpmyadmin/phpmyadmin/commit/91a66bf5ef10eada07c7056b05d3aa8646ece6dc
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Changed paths:
    M po/fr.po

  Log Message:
  -----------
  Remove dead messages

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


  Commit: 104756e0a586f75d6ac0308805b64a35fd62c66b
      https://github.com/phpmyadmin/phpmyadmin/commit/104756e0a586f75d6ac0308805b64a35fd62c66b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Changed paths:
    M .travis.yml
    M build.xml
    M composer.json

  Log Message:
  -----------
  Merge pull request #1348 from D-storm/travis

use phpunit 4.1.x for testing (Travis)


  Commit: b55df3c9b17865bb1a34be0694e627a8cf386232
      https://github.com/phpmyadmin/phpmyadmin/commit/b55df3c9b17865bb1a34be0694e627a8cf386232
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Changed paths:
    M po/tr.po

  Log Message:
  -----------
  Fix Turkish problem in message generation

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


  Commit: de4f81ea2b32a0b3caa38d43a139decb08e5a220
      https://github.com/phpmyadmin/phpmyadmin/commit/de4f81ea2b32a0b3caa38d43a139decb08e5a220
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Changed paths:
    M po/zh_TW.po

  Log Message:
  -----------
  Remove problematic translated message

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


  Commit: 800dc32e2342c44d650375d833681211214fdc16
      https://github.com/phpmyadmin/phpmyadmin/commit/800dc32e2342c44d650375d833681211214fdc16
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Changed paths:
    M libraries/plugins/import/ImportCsv.class.php

  Log Message:
  -----------
  Remove useless code

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


  Commit: 0266a6a55cabab65d6ce05ac9c3e863f721f8785
      https://github.com/phpmyadmin/phpmyadmin/commit/0266a6a55cabab65d6ce05ac9c3e863f721f8785
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Log Message:
  -----------
  Merge commit 'b0d3056'


  Commit: 68c82fcd2eecfeafaf31d36836de480f3d86671a
      https://github.com/phpmyadmin/phpmyadmin/commit/68c82fcd2eecfeafaf31d36836de480f3d86671a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  4.2.9-dev

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


  Commit: 321d3eee91be01b7220e9e7bad03b918e6330725
      https://github.com/phpmyadmin/phpmyadmin/commit/321d3eee91be01b7220e9e7bad03b918e6330725
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Changed paths:
    M ChangeLog

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


  Commit: f26f6287db0c7c6133b73a28e8350aa5d90f2596
      https://github.com/phpmyadmin/phpmyadmin/commit/f26f6287db0c7c6133b73a28e8350aa5d90f2596
  Author: chanaka <chanaka at oneit.com.au>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Changed paths:
    M libraries/rte/rte_main.inc.php

  Log Message:
  -----------
  Remove useless code

Signed-off-by: chanaka <chanaka at oneit.com.au>


  Commit: ecdc5f3dc66d124d4f7f3944a1764efc5e53c989
      https://github.com/phpmyadmin/phpmyadmin/commit/ecdc5f3dc66d124d4f7f3944a1764efc5e53c989
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Changed paths:
    M js/console.js
    M libraries/config/Validator.class.php
    M libraries/config/config_functions.lib.php

  Log Message:
  -----------
  Remove dead code

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


  Commit: 3ebd68a3153002cb3b9f9364bb8b2ab5d939c364
      https://github.com/phpmyadmin/phpmyadmin/commit/3ebd68a3153002cb3b9f9364bb8b2ab5d939c364
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-08-31 (Sun, 31 Aug 2014)

  Changed paths:
    M libraries/config/Validator.class.php

  Log Message:
  -----------
  Fix coding style

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


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

  Changed paths:
    M libraries/relation.lib.php

  Log Message:
  -----------
  Fix parameter type

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


  Commit: 4faa0d1ebdf035c4069ab427b3c1b8662ae902c4
      https://github.com/phpmyadmin/phpmyadmin/commit/4faa0d1ebdf035c4069ab427b3c1b8662ae902c4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M ChangeLog
    M js/ajax.js

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


  Commit: 06e8b65738560f52766dd9087a2c9dec9f5be45e
      https://github.com/phpmyadmin/phpmyadmin/commit/06e8b65738560f52766dd9087a2c9dec9f5be45e
  Author: cmyker <cmyk777 at gmail.com>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php

  Log Message:
  -----------
  Support of MariaDB 10+ multi-master replication functionality See https://mariadb.com/kb/en/mariadb/documentation/replication-cluster-multi-master/replication/multi-source-replication/

Signed-off-by: Igor Prokopenkov <cmyk777 at gmail.com>


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

  Changed paths:
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php

  Log Message:
  -----------
  Merge pull request #1350 from cmyker/master

Support of MariaDB 10+ multi-master replication functionality See https:...


  Commit: 4d7e19839b0616d8ce8ff9a78024ad6038c61f1c
      https://github.com/phpmyadmin/phpmyadmin/commit/4d7e19839b0616d8ce8ff9a78024ad6038c61f1c
  Author: Alex Smirnov <alex-smirnov at mail.ru>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M po/ru.po

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

Currently translated at 99.7% (2956 of 2964)

[ci skip]


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

  Changed paths:
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php

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


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

  Changed paths:
    M ChangeLog

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

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


  Commit: 5a5bd3e5354a16669be9c79b45df2d0985727c87
      https://github.com/phpmyadmin/phpmyadmin/commit/5a5bd3e5354a16669be9c79b45df2d0985727c87
  Author: Igor Prokopenkov <cmyk777 at gmail.com>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php

  Log Message:
  -----------
  Fixed undefined index notices
Fixed misspelling in the comment

Signed-off-by: Igor Prokopenkov <cmyk777 at gmail.com>


  Commit: b497324ad6190b181a477c959ec3a9c5fc8fd351
      https://github.com/phpmyadmin/phpmyadmin/commit/b497324ad6190b181a477c959ec3a9c5fc8fd351
  Author: Igor Prokopenkov <cmyk777 at gmail.com>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M libraries/replication_gui.lib.php

  Log Message:
  -----------
  Removed trailing whitespace

Signed-off-by: Igor Prokopenkov <cmyk777 at gmail.com>


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

  Changed paths:
    M libraries/tbl_printview.lib.php
    M tbl_printview.php

  Log Message:
  -----------
  Remove dead code

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


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

  Changed paths:
    M libraries/tbl_printview.lib.php

  Log Message:
  -----------
  Fix parameter type

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


  Commit: f2911580698a9a71e16579fee8190963e1b1e25d
      https://github.com/phpmyadmin/phpmyadmin/commit/f2911580698a9a71e16579fee8190963e1b1e25d
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    M po/nl.po

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

Currently translated at 98.6% (2923 of 2964)

[ci skip]


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

  Changed paths:
    M libraries/tbl_printview.lib.php
    M tbl_printview.php

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


  Commit: adb0ad4fb80c8b1b65388e57fd9c64957a7e3aa6
      https://github.com/phpmyadmin/phpmyadmin/commit/adb0ad4fb80c8b1b65388e57fd9c64957a7e3aa6
  Author: Igor Prokopenkov <cmyk777 at gmail.com>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    M libraries/replication.inc.php

  Log Message:
  -----------
  https://github.com/phpmyadmin/phpmyadmin/pull/1351/files#r16997280

Signed-off-by: Igor Prokopenkov <cmyk777 at gmail.com>


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

  Changed paths:
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php

  Log Message:
  -----------
  Merge pull request #1351 from cmyker/master

Fixed undefined index notices


  Commit: 9ee46bef3e4d993b021fbf10ba025b19834f848d
      https://github.com/phpmyadmin/phpmyadmin/commit/9ee46bef3e4d993b021fbf10ba025b19834f848d
  Author: Aputsiaq Niels Janussen <aj at isit.gl>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    M po/da.po

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

Currently translated at 96.8% (2870 of 2964)

[ci skip]


  Commit: 873f2f93cf4b9073ba5b4477311d213813f5ec32
      https://github.com/phpmyadmin/phpmyadmin/commit/873f2f93cf4b9073ba5b4477311d213813f5ec32
  Author: Weblate <noreply at weblate.org>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php

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


  Commit: 3464916f306746b5452b6fbc6d9ec3b384a403ca
      https://github.com/phpmyadmin/phpmyadmin/commit/3464916f306746b5452b6fbc6d9ec3b384a403ca
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    M test/libraries/PMA_server_status_queries_test.php

  Log Message:
  -----------
  Remove dead code

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


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

  Changed paths:
    M libraries/build_html_for_db.lib.php
    M test/libraries/PMA_build_html_for_db_test.php

  Log Message:
  -----------
  Remove Overhead from Server > Databases > Enable Statistics. We cannot show
correct results in the case of InnoDB tables.

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


  Commit: d7431f6783d646ea09c899e5abc73aaa263b9702
      https://github.com/phpmyadmin/phpmyadmin/commit/d7431f6783d646ea09c899e5abc73aaa263b9702
  Author: Caio Fonsêca <caio1478 at gmail.com>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M po/pt_BR.po

  Log Message:
  -----------
  Translated using Weblate (Portuguese (Brazil))

Currently translated at 93.6% (2777 of 2964)

[ci skip]


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

  Changed paths:
    M libraries/build_html_for_db.lib.php
    M test/libraries/PMA_build_html_for_db_test.php

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


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

  Changed paths:
    M libraries/display_export.lib.php

  Log Message:
  -----------
  Fix parameter type

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


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

  Changed paths:
    M po/pt_BR.po

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: 7d918615e24653752a1f9a18fe16fd75a81b4c91
      https://github.com/phpmyadmin/phpmyadmin/commit/7d918615e24653752a1f9a18fe16fd75a81b4c91
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    M libraries/tbl_relation.lib.php

  Log Message:
  -----------
  Fix parameter type

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


  Commit: 4def6c262b5065f26c93925876d6df32ff371e99
      https://github.com/phpmyadmin/phpmyadmin/commit/4def6c262b5065f26c93925876d6df32ff371e99
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    M ChangeLog
    M js/sql.js

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


  Commit: a4e2472108d268c14bef5faebac2fd53c04b969b
      https://github.com/phpmyadmin/phpmyadmin/commit/a4e2472108d268c14bef5faebac2fd53c04b969b
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M libraries/insert_edit.lib.php
    M test/libraries/PMA_insert_edit_test.php

  Log Message:
  -----------
  check null checkbox for datetime with default value null

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: 9b77d746aba7ded13aa68f98ac4b5840f2d438f8
      https://github.com/phpmyadmin/phpmyadmin/commit/9b77d746aba7ded13aa68f98ac4b5840f2d438f8
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M changelog.php
    M db_datadict.php
    M db_operations.php
    M db_printview.php
    M examples/openid.php
    M export.php
    M file_echo.php
    M gis_data_editor.php
    M import.php
    M import_status.php
    M index.php
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    M libraries/DBQbe.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DbSearch.class.php
    M libraries/DisplayResults.class.php
    M libraries/Error.class.php
    M libraries/File.class.php
    M libraries/Font.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/Message.class.php
    M libraries/PDF.class.php
    M libraries/RecentFavoriteTable.class.php
    M libraries/Response.class.php
    M libraries/Scripts.class.php
    M libraries/ServerStatusData.class.php
    M libraries/StorageEngine.class.php
    M libraries/String.class.php
    M libraries/StringByte.int.php
    M libraries/StringMB.class.php
    M libraries/StringNative.class.php
    M libraries/StringType.int.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Tracker.class.php
    M libraries/Types.class.php
    M libraries/Util.class.php
    M libraries/bookmark.lib.php
    M libraries/build_html_for_db.lib.php
    M libraries/central_columns.lib.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/config/Form.class.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/FormDisplay.tpl.php
    M libraries/config/ServerConfigChecks.class.php
    M libraries/config/Validator.class.php
    M libraries/core.lib.php
    M libraries/db_common.inc.php
    M libraries/db_designer.lib.php
    M libraries/db_table_exists.lib.php
    M libraries/display_change_password.lib.php
    M libraries/display_export.lib.php
    M libraries/display_git_revision.lib.php
    M libraries/error_report.lib.php
    M libraries/export.lib.php
    M libraries/file_listing.lib.php
    M libraries/gis/GIS_Factory.class.php
    M libraries/gis/GIS_Geometry.class.php
    M libraries/gis/GIS_Geometrycollection.class.php
    M libraries/gis/GIS_Linestring.class.php
    M libraries/gis/GIS_Multilinestring.class.php
    M libraries/gis/GIS_Multipoint.class.php
    M libraries/gis/GIS_Multipolygon.class.php
    M libraries/gis/GIS_Point.class.php
    M libraries/gis/GIS_Polygon.class.php
    M libraries/gis/GIS_Visualization.class.php
    M libraries/iconv_wrapper.lib.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/ip_allow_deny.lib.php
    M libraries/mime.lib.php
    M libraries/mult_submits.inc.php
    M libraries/mult_submits.lib.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/normalization.lib.php
    M libraries/operations.lib.php
    M libraries/parse_analyze.inc.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/export/ExportCsv.class.php
    M libraries/plugins/export/ExportLatex.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportXml.class.php
    M libraries/plugins/export/TableProperty.class.php
    M libraries/plugins/import/ImportCsv.class.php
    M libraries/plugins/import/ImportMediawiki.class.php
    M libraries/plugins/import/ImportShp.class.php
    M libraries/plugins/import/ImportSql.class.php
    M libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
    M libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
    M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
    M libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
    M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
    M libraries/pmd_common.php
    M libraries/relation.lib.php
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_main.inc.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php
    M libraries/rte/rte_words.lib.php
    M libraries/sanitizing.lib.php
    M libraries/select_lang.lib.php
    M libraries/server_databases.lib.php
    M libraries/server_plugins.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/server_status_processes.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_user_groups.lib.php
    M libraries/server_variables.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.lib.php
    M libraries/structure.lib.php
    M libraries/sysinfo.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_indexes.lib.php
    M libraries/tbl_info.inc.php
    M libraries/tbl_relation.lib.php
    M libraries/tbl_tracking.lib.php
    M libraries/transformations.lib.php
    M libraries/url_generating.lib.php
    M prefs_manage.php
    M scripts/decode_bug.php
    M setup/frames/index.inc.php
    M setup/lib/ConfigGenerator.class.php
    M sql.php
    M tbl_addfield.php
    M tbl_change.php
    M tbl_chart.php
    M tbl_create.php
    M tbl_get_field.php
    M tbl_operations.php
    M tbl_printview.php
    M test/bootstrap-dist.php
    M test/classes/PMA_Config_test.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    M test/classes/plugin/import/ImportShp_test.php
    M test/libraries/PMA_StringMB_test.php
    M test/libraries/PMA_StringNative_test.php
    A test/libraries/PMA_String_Compare_test.php
    M test/libraries/PMA_browse_foreigners_test.php
    M test/libraries/PMA_central_columns_test.php
    M test/libraries/PMA_display_export_test.php
    M test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/core/PMA_warnMissingExtension_test.php
    M test/selenium/PmaSeleniumTableInsertTest.php
    M test/selenium/PmaSeleniumXssTest.php
    M test/selenium/TestBase.php
    M themes/svg_gradient.php
    M transformation_wrapper.php

  Log Message:
  -----------
  Mass modifications to use PMA_String.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 767b45380cccc9a2b8fae0a4b91afbe04e14fdb8
      https://github.com/phpmyadmin/phpmyadmin/commit/767b45380cccc9a2b8fae0a4b91afbe04e14fdb8
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M .travis.yml
    M ChangeLog
    M build.xml
    M composer.json
    M js/ajax.js
    M js/console.js
    M libraries/config/Validator.class.php
    M libraries/config/config_functions.lib.php
    M libraries/plugins/import/ImportCsv.class.php
    M libraries/relation.lib.php
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_main.inc.php
    M po/fr.po
    M po/ru.po
    M po/tr.po
    M po/zh_TW.po

  Log Message:
  -----------
  Merge branch 'master' into securityStringSquash


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

  Changed paths:
    M libraries/insert_edit.lib.php
    M test/libraries/PMA_insert_edit_test.php

  Log Message:
  -----------
  Merge pull request #1352 from D-storm/null-datetime

check null checkbox for datetime with default value null


  Commit: fe452a7240c5684451c30b7e70b0a1818419e344
      https://github.com/phpmyadmin/phpmyadmin/commit/fe452a7240c5684451c30b7e70b0a1818419e344
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M libraries/DBQbe.class.php
    M libraries/DisplayResults.class.php
    M libraries/Table.class.php
    M libraries/display_change_password.lib.php
    M libraries/export.lib.php
    M libraries/gis/GIS_Multipoint.class.php
    M libraries/gis/GIS_Multipolygon.class.php
    M libraries/gis/GIS_Polygon.class.php
    M libraries/insert_edit.lib.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php
    M libraries/sql.lib.php
    M libraries/sqlparser.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_columns_definition_form.lib.php

  Log Message:
  -----------
  Make Scrutinizer happier.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: d4bbde9ec561723c756b38924f012007e64112d0
      https://github.com/phpmyadmin/phpmyadmin/commit/d4bbde9ec561723c756b38924f012007e64112d0
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M libraries/DisplayResults.class.php
    M libraries/Table.class.php
    M libraries/plugins/import/AbstractImportCsv.class.php
    M libraries/plugins/import/ImportCsv.class.php
    M libraries/plugins/import/ImportMediawiki.class.php
    M libraries/plugins/import/ImportOds.class.php

  Log Message:
  -----------
  Make Scrutinizer happier.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 70366f31c160025b6ef6b622de2a46db6b8186c8
      https://github.com/phpmyadmin/phpmyadmin/commit/70366f31c160025b6ef6b622de2a46db6b8186c8
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M libraries/plugins/ImportPlugin.class.php
    M libraries/plugins/import/AbstractImportCsv.class.php

  Log Message:
  -----------
  Move method definition.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 623715c5f9d13e7b2a9bbeb886c70f07d2c4aa99
      https://github.com/phpmyadmin/phpmyadmin/commit/623715c5f9d13e7b2a9bbeb886c70f07d2c4aa99
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M libraries/String.class.php
    M libraries/StringByte.int.php
    M libraries/StringMB.class.php
    M libraries/StringNative.class.php
    M libraries/import.lib.php
    M test/libraries/PMA_String_Compare_test.php

  Log Message:
  -----------
  Add PMA_String::substrCount.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: ff0011ac3fdfebbd2ea8e329829f649a575dc181
      https://github.com/phpmyadmin/phpmyadmin/commit/ff0011ac3fdfebbd2ea8e329829f649a575dc181
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M changelog.php
    M db_datadict.php
    M db_operations.php
    M db_printview.php
    M examples/openid.php
    M export.php
    M file_echo.php
    M gis_data_editor.php
    M import.php
    M import_status.php
    M index.php
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    M libraries/DBQbe.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DbSearch.class.php
    M libraries/DisplayResults.class.php
    M libraries/Error.class.php
    M libraries/File.class.php
    M libraries/Font.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/Message.class.php
    M libraries/PDF.class.php
    M libraries/RecentFavoriteTable.class.php
    M libraries/Response.class.php
    M libraries/Scripts.class.php
    M libraries/ServerStatusData.class.php
    M libraries/StorageEngine.class.php
    M libraries/String.class.php
    M libraries/StringByte.int.php
    M libraries/StringMB.class.php
    M libraries/StringNative.class.php
    M libraries/StringType.int.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Tracker.class.php
    M libraries/Types.class.php
    M libraries/Util.class.php
    M libraries/bookmark.lib.php
    M libraries/build_html_for_db.lib.php
    M libraries/central_columns.lib.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/config/Form.class.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/FormDisplay.tpl.php
    M libraries/config/ServerConfigChecks.class.php
    M libraries/config/Validator.class.php
    M libraries/core.lib.php
    M libraries/db_common.inc.php
    M libraries/db_designer.lib.php
    M libraries/db_table_exists.lib.php
    M libraries/display_change_password.lib.php
    M libraries/display_export.lib.php
    M libraries/display_git_revision.lib.php
    M libraries/error_report.lib.php
    M libraries/export.lib.php
    M libraries/file_listing.lib.php
    M libraries/gis/GIS_Factory.class.php
    M libraries/gis/GIS_Geometry.class.php
    M libraries/gis/GIS_Geometrycollection.class.php
    M libraries/gis/GIS_Linestring.class.php
    M libraries/gis/GIS_Multilinestring.class.php
    M libraries/gis/GIS_Multipoint.class.php
    M libraries/gis/GIS_Multipolygon.class.php
    M libraries/gis/GIS_Point.class.php
    M libraries/gis/GIS_Polygon.class.php
    M libraries/gis/GIS_Visualization.class.php
    M libraries/iconv_wrapper.lib.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/ip_allow_deny.lib.php
    M libraries/mime.lib.php
    M libraries/mult_submits.inc.php
    M libraries/mult_submits.lib.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/normalization.lib.php
    M libraries/operations.lib.php
    M libraries/parse_analyze.inc.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/ImportPlugin.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/export/ExportCsv.class.php
    M libraries/plugins/export/ExportLatex.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportXml.class.php
    M libraries/plugins/export/TableProperty.class.php
    M libraries/plugins/import/ImportCsv.class.php
    M libraries/plugins/import/ImportMediawiki.class.php
    M libraries/plugins/import/ImportOds.class.php
    M libraries/plugins/import/ImportShp.class.php
    M libraries/plugins/import/ImportSql.class.php
    M libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
    M libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
    M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
    M libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
    M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
    M libraries/pmd_common.php
    M libraries/relation.lib.php
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_main.inc.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php
    M libraries/rte/rte_words.lib.php
    M libraries/sanitizing.lib.php
    M libraries/select_lang.lib.php
    M libraries/server_databases.lib.php
    M libraries/server_plugins.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/server_status_processes.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_user_groups.lib.php
    M libraries/server_variables.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.lib.php
    M libraries/structure.lib.php
    M libraries/sysinfo.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_indexes.lib.php
    M libraries/tbl_info.inc.php
    M libraries/tbl_relation.lib.php
    M libraries/tbl_tracking.lib.php
    M libraries/transformations.lib.php
    M libraries/url_generating.lib.php
    M prefs_manage.php
    M scripts/decode_bug.php
    M setup/frames/index.inc.php
    M setup/lib/ConfigGenerator.class.php
    M sql.php
    M tbl_addfield.php
    M tbl_change.php
    M tbl_chart.php
    M tbl_create.php
    M tbl_get_field.php
    M tbl_operations.php
    M tbl_printview.php
    M test/bootstrap-dist.php
    M test/classes/PMA_Config_test.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    M test/classes/plugin/import/ImportShp_test.php
    M test/libraries/PMA_StringMB_test.php
    M test/libraries/PMA_StringNative_test.php
    A test/libraries/PMA_String_Compare_test.php
    M test/libraries/PMA_browse_foreigners_test.php
    M test/libraries/PMA_central_columns_test.php
    M test/libraries/PMA_display_export_test.php
    M test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/core/PMA_warnMissingExtension_test.php
    M test/selenium/PmaSeleniumTableInsertTest.php
    M test/selenium/PmaSeleniumXssTest.php
    M test/selenium/TestBase.php
    M themes/svg_gradient.php
    M transformation_wrapper.php

  Log Message:
  -----------
  Merge pull request #1353 from Tithugues/securityStringSquash

Mass modifications to use PMA_String.


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

  Changed paths:
    M libraries/core.lib.php
    M libraries/sqlparser.lib.php
    R libraries/string.inc.php
    M test/classes/plugin/transformations/Transformation_Plugins_test.php
    M test/libraries/PMA_browse_foreigners_test.php

  Log Message:
  -----------
  No need to have a distinct file

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


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

  Changed paths:
    M libraries/StringNative.class.php
    M libraries/build_html_for_db.lib.php

  Log Message:
  -----------
  Fix typos

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


  Commit: 598589416050e0c5c954f11e77af00d6d766c496
      https://github.com/phpmyadmin/phpmyadmin/commit/598589416050e0c5c954f11e77af00d6d766c496
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-07 (Sun, 07 Sep 2014)

  Changed paths:
    M libraries/Config.class.php
    M libraries/Console.class.php
    M libraries/DBQbe.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DbSearch.class.php
    M libraries/DisplayResults.class.php
    M libraries/Error_Handler.class.php
    M libraries/File.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/List.class.php
    M libraries/Message.class.php
    M libraries/OutputBuffering.class.php
    M libraries/PDF.class.php
    M libraries/RecentFavoriteTable.class.php
    M libraries/Response.class.php
    M libraries/ServerStatusData.class.php
    M libraries/build_html_for_db.lib.php
    M libraries/central_columns.lib.php
    M libraries/config.default.php
    M libraries/core.lib.php
    M libraries/create_addfield.lib.php
    M libraries/database_interface.inc.php
    M libraries/db_designer.lib.php
    M libraries/db_info.inc.php
    M libraries/display_import.lib.php
    M libraries/error_report.lib.php
    M libraries/file_listing.lib.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/mult_submits.lib.php
    M libraries/normalization.lib.php
    M libraries/operations.lib.php
    M libraries/parse_analyze.inc.php
    M libraries/plugin_interface.lib.php
    M libraries/pmd_common.php
    M libraries/relation.lib.php
    M libraries/rte/rte_words.lib.php
    M libraries/select_server.lib.php
    M libraries/server_databases.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_user_groups.lib.php
    M libraries/session.inc.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/tbl_columns_definition_form.lib.php

  Log Message:
  -----------
  Fix typos.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: e28a833103d0b7940a25e8074c7dbc8df3f78fbc
      https://github.com/phpmyadmin/phpmyadmin/commit/e28a833103d0b7940a25e8074c7dbc8df3f78fbc
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-07 (Sun, 07 Sep 2014)

  Changed paths:
    M libraries/StringNative.class.php
    M libraries/core.lib.php
    M libraries/sqlparser.lib.php
    R libraries/string.inc.php
    M test/classes/plugin/transformations/Transformation_Plugins_test.php
    M test/libraries/PMA_browse_foreigners_test.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: 360a012c8831e4f9aadd0416ddd58b0bb24ee112
      https://github.com/phpmyadmin/phpmyadmin/commit/360a012c8831e4f9aadd0416ddd58b0bb24ee112
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-07 (Sun, 07 Sep 2014)

  Changed paths:
    M libraries/tbl_columns_definition_form.inc.php

  Log Message:
  -----------
  Add missing  definition.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M libraries/insert_edit.lib.php
    M test/libraries/PMA_insert_edit_test.php

  Log Message:
  -----------
  Remove dead code

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


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

  Changed paths:
    M libraries/tbl_columns_definition_form.inc.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


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

  Changed paths:
    M libraries/insert_edit.lib.php
    M tbl_replace.php
    M test/libraries/PMA_insert_edit_test.php

  Log Message:
  -----------
  Remove unused parameter

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


  Commit: c3aeccad1d0b0eb2c4a39f8c1f665966d2ce6b90
      https://github.com/phpmyadmin/phpmyadmin/commit/c3aeccad1d0b0eb2c4a39f8c1f665966d2ce6b90
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-07 (Sun, 07 Sep 2014)

  Log Message:
  -----------
  Merge commit 'e1664a35e'


  Commit: cf5783e4278838a3b8d840e6150b14b8cf3b6163
      https://github.com/phpmyadmin/phpmyadmin/commit/cf5783e4278838a3b8d840e6150b14b8cf3b6163
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-07 (Sun, 07 Sep 2014)

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

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


  Commit: 38e78437cb3a0b9d3de23dc8eb33f93efbae7a30
      https://github.com/phpmyadmin/phpmyadmin/commit/38e78437cb3a0b9d3de23dc8eb33f93efbae7a30
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-07 (Sun, 07 Sep 2014)

  Changed paths:
    M libraries/insert_edit.lib.php
    M tbl_replace.php
    M test/libraries/PMA_insert_edit_test.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


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

  Changed paths:
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  Fix coding style

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


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

  Changed paths:
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  Fix code execution path warning

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


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

  Changed paths:
    M build.xml

  Log Message:
  -----------
  Exclude composer installation directory from code checks

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


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

  Changed paths:
    M ChangeLog
    M libraries/display_change_password.lib.php
    M test/libraries/PMA_display_change_password_test.php

  Log Message:
  -----------
  rfe #1544 MySQL 5.7.5 compatibility

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


  Commit: 3cd1d69f8be77f1b334b7b423617e5c02f8ee32f
      https://github.com/phpmyadmin/phpmyadmin/commit/3cd1d69f8be77f1b334b7b423617e5c02f8ee32f
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-08 (Mon, 08 Sep 2014)

  Changed paths:
    M libraries/String.class.php
    M libraries/StringByte.int.php
    M libraries/StringMB.class.php
    M libraries/StringNative.class.php
    M test/libraries/PMA_StringMB_test.php
    M test/libraries/PMA_StringNative_test.php

  Log Message:
  -----------
  Improve PMA_String* unit tests.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M libraries/server_privileges.lib.php
    M server_privileges.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Remove dead code

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


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

  Changed paths:
    M libraries/display_structure.inc.php
    M libraries/structure.lib.php

  Log Message:
  -----------
  Remove unused parameter

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


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

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Remove dead code

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


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

  Changed paths:
    M ChangeLog
    M libraries/mult_submits.lib.php
    M libraries/sql.lib.php

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


  Commit: 7b6c4e01e3c0956e48b17e5af2f3332cda104bdf
      https://github.com/phpmyadmin/phpmyadmin/commit/7b6c4e01e3c0956e48b17e5af2f3332cda104bdf
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-12 (Fri, 12 Sep 2014)

  Changed paths:
    M test/libraries/PMA_display_export_test.php

  Log Message:
  -----------
  Remove dead code

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


  Commit: abd86bec459eb6de2d36ee37ca4e34f67457f0b9
      https://github.com/phpmyadmin/phpmyadmin/commit/abd86bec459eb6de2d36ee37ca4e34f67457f0b9
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2014-09-12 (Fri, 12 Sep 2014)

  Changed paths:
    M po/et.po

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

Currently translated at 100.0% (2964 of 2964)

[ci skip]


  Commit: 22096fcdc8ace58e990c0ade040f564d03c87f31
      https://github.com/phpmyadmin/phpmyadmin/commit/22096fcdc8ace58e990c0ade040f564d03c87f31
  Author: Weblate <noreply at weblate.org>
  Date:   2014-09-12 (Fri, 12 Sep 2014)

  Changed paths:
    M test/libraries/PMA_display_export_test.php

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


  Commit: 42223e1bf658e721359ccfb8b19fbad292b7c4e8
      https://github.com/phpmyadmin/phpmyadmin/commit/42223e1bf658e721359ccfb8b19fbad292b7c4e8
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-09-13 (Sat, 13 Sep 2014)

  Changed paths:
    M index.php
    M js/functions.js
    M libraries/Header.class.php
    M libraries/plugins/auth/AuthenticationConfig.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  avoid session timeout when user is active FR#1529

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


  Commit: e12131f7694cd73e9eda629bd096a3ce775525cb
      https://github.com/phpmyadmin/phpmyadmin/commit/e12131f7694cd73e9eda629bd096a3ce775525cb
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-09-13 (Sat, 13 Sep 2014)

  Changed paths:
    M libraries/display_structure.inc.php
    M libraries/insert_edit.lib.php
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  CSS imprvements - added more space between top menu and page content in structure and insert pages

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


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

  Changed paths:
    M index.php
    M js/functions.js
    M libraries/Header.class.php
    M libraries/plugins/auth/AuthenticationConfig.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  Merge pull request #1355 from smita786/master

avoid session timeout when user is active FR#1529


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

  Changed paths:
    M ChangeLog

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

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


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

  Log Message:
  -----------
  Merge commit '01c553a'


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

  Changed paths:
    M ChangeLog
    M js/ajax.js
    A js/whitelist.php
    M libraries/Header.class.php
    M libraries/Scripts.class.php

  Log Message:
  -----------
  Fix merge conflicts

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


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

  Log Message:
  -----------
  Merge commit 'c0548df'


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

  Log Message:
  -----------
  Merge commit 'e38891f'


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

  Changed paths:
    M test/classes/PMA_Scripts_test.php

  Log Message:
  -----------
  Fix tests

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


  Commit: e85eddb01f4ddf4c5525db7152d796995555721b
      https://github.com/phpmyadmin/phpmyadmin/commit/e85eddb01f4ddf4c5525db7152d796995555721b
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-13 (Sat, 13 Sep 2014)

  Changed paths:
    M ChangeLog
    M libraries/String.class.php
    M libraries/StringByte.int.php
    M libraries/StringMB.class.php
    M libraries/StringNative.class.php
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Fix #4528 Can't import dump via SQL field

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M tbl_zoom_select.php

  Log Message:
  -----------
  Fix code execution path warning

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


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

  Changed paths:
    M ChangeLog
    M libraries/String.class.php
    M libraries/StringByte.int.php
    M libraries/StringMB.class.php
    M libraries/StringNative.class.php
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Merge pull request #1356 from Tithugues/b4528_master

Fix #4528 Can't import dump via SQL field


  Commit: ebda4090db502e71543d80db452f80bb151299e0
      https://github.com/phpmyadmin/phpmyadmin/commit/ebda4090db502e71543d80db452f80bb151299e0
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-14 (Sun, 14 Sep 2014)

  Changed paths:
    M libraries/navigation/NavigationTree.class.php
    M libraries/sql.lib.php
    M libraries/sqlparser.lib.php
    M test/classes/PMA_Scripts_test.php

  Log Message:
  -----------
  Coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: f0c1480ee79ba9f6323bfec01de88f451215fe58
      https://github.com/phpmyadmin/phpmyadmin/commit/f0c1480ee79ba9f6323bfec01de88f451215fe58
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-14 (Sun, 14 Sep 2014)

  Changed paths:
    M js/common.js

  Log Message:
  -----------
  Javascript coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: aac5379dff8537c07d5a74b309e4461a6e250438
      https://github.com/phpmyadmin/phpmyadmin/commit/aac5379dff8537c07d5a74b309e4461a6e250438
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-14 (Sun, 14 Sep 2014)

  Changed paths:
    M libraries/properties/options/OptionsPropertyItem.class.php

  Log Message:
  -----------
  Fix typo.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: b4b506af2fd8d0c946b36b02378ac994665e772f
      https://github.com/phpmyadmin/phpmyadmin/commit/b4b506af2fd8d0c946b36b02378ac994665e772f
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-14 (Sun, 14 Sep 2014)

  Changed paths:
    M libraries/DatabaseInterface.class.php

  Log Message:
  -----------
  Coding style modification.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: f9dd601397cd4a4a5684d287042c2e898aff9495
      https://github.com/phpmyadmin/phpmyadmin/commit/f9dd601397cd4a4a5684d287042c2e898aff9495
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-14 (Sun, 14 Sep 2014)

  Changed paths:
    M import.php
    M libraries/plugin_interface.lib.php

  Log Message:
  -----------
  Coding style modifications.
Refactoring.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M ChangeLog
    M js/tbl_change.js

  Log Message:
  -----------
  Merge commit '41c0251'


  Commit: 4ac743f5e9f2150bbbb48612d600e0dbded7bc74
      https://github.com/phpmyadmin/phpmyadmin/commit/4ac743f5e9f2150bbbb48612d600e0dbded7bc74
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Log Message:
  -----------
  Merge commit '26b6ba5'


  Commit: 250482589e6c861631f0c4b0ebe87200081a310c
      https://github.com/phpmyadmin/phpmyadmin/commit/250482589e6c861631f0c4b0ebe87200081a310c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge commit '6af812e'


  Commit: 7b619ab00b9e27903e2861d5512016e5c3c5c7a9
      https://github.com/phpmyadmin/phpmyadmin/commit/7b619ab00b9e27903e2861d5512016e5c3c5c7a9
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Log Message:
  -----------
  Merge commit '35dd99c'


  Commit: 54773d9565d7412f630dfe256cbe8d8c55afaf55
      https://github.com/phpmyadmin/phpmyadmin/commit/54773d9565d7412f630dfe256cbe8d8c55afaf55
  Author: Kyeong Su Shin <cdac1234 at gmail.com>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M po/ko.po

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

Currently translated at 79.6% (2362 of 2964)

[ci skip]


  Commit: 57e1d10b02d40d1f44f3de5d6d76601aba39ff37
      https://github.com/phpmyadmin/phpmyadmin/commit/57e1d10b02d40d1f44f3de5d6d76601aba39ff37
  Author: Weblate <noreply at weblate.org>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M ChangeLog
    M js/tbl_change.js

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


  Commit: 9ab4ade266ad5fe220cd0ee70349c7c521119dd3
      https://github.com/phpmyadmin/phpmyadmin/commit/9ab4ade266ad5fe220cd0ee70349c7c521119dd3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M js/ajax.js
    M js/common.js
    M libraries/Response.class.php
    M test/libraries/common/PMA_showMessage_test_disabled.php
    M test/theme.php

  Log Message:
  -----------
  Remove dead code

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


  Commit: 01740a54f7d30a129d291728d3b2c248eb83eaa5
      https://github.com/phpmyadmin/phpmyadmin/commit/01740a54f7d30a129d291728d3b2c248eb83eaa5
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M tbl_zoom_select.php

  Log Message:
  -----------
  Fix typo

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


  Commit: 866a62800d3aaa1f9368a577e794b59902590730
      https://github.com/phpmyadmin/phpmyadmin/commit/866a62800d3aaa1f9368a577e794b59902590730
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M libraries/DisplayResults.class.php
    M test/classes/PMA_DisplayResults_test.php

  Log Message:
  -----------
  Remove unused variable  in _getPlacedLinks() function

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


  Commit: d052fd0c51cd4dddba72a882cda0a7045514791c
      https://github.com/phpmyadmin/phpmyadmin/commit/d052fd0c51cd4dddba72a882cda0a7045514791c
  Author: Igor Prokopenkov <cmyk777 at gmail.com>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M libraries/replication_gui.lib.php

  Log Message:
  -----------
  Fix: broken skip slave error functionality

libraries/replication_gui.lib.php:908
function PMA_handleControlRequest()
checks for
if (isset($_REQUEST['sr_take_action']))
libraries/replication_gui.lib.php:202
but sr_take_action variable isn't included in $slave_skip_error_link generation

Signed-off-by: Igor Prokopenkov <cmyk777 at gmail.com>


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

  Changed paths:
    M libraries/replication_gui.lib.php

  Log Message:
  -----------
  Merge pull request #1359 from cmyker/master

Fix: broken skip slave error functionality


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

  Changed paths:
    M db_datadict.php

  Log Message:
  -----------
  Fix code execution path warning

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


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

  Changed paths:
    M libraries/relation.lib.php

  Log Message:
  -----------
  Remove dead code

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


  Commit: fe17e812998879ad838ec5e109ebadb406594b28
      https://github.com/phpmyadmin/phpmyadmin/commit/fe17e812998879ad838ec5e109ebadb406594b28
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-09-16 (Tue, 16 Sep 2014)

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Remove unused variables

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


  Commit: 08e8ab1cdaa7812ff66d411ed03325c87241522b
      https://github.com/phpmyadmin/phpmyadmin/commit/08e8ab1cdaa7812ff66d411ed03325c87241522b
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M libraries/DisplayResults.class.php
    M test/classes/PMA_DisplayResults_test.php

  Log Message:
  -----------
  Remove unused parameter

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


  Commit: 31da8b1cdc8d8a19bea5c6f31a3cf36a2682ab27
      https://github.com/phpmyadmin/phpmyadmin/commit/31da8b1cdc8d8a19bea5c6f31a3cf36a2682ab27
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M libraries/DisplayResults.class.php
    M test/classes/PMA_DisplayResults_test.php

  Log Message:
  -----------
  Remove unsed  variable

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


  Commit: 4c1d1b877fe9026d6587089f48600c7f287a34fe
      https://github.com/phpmyadmin/phpmyadmin/commit/4c1d1b877fe9026d6587089f48600c7f287a34fe
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M db_datadict.php
    M libraries/relation.lib.php
    M libraries/replication_gui.lib.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: d510e19e7788435c101abc8026b75bbdfc063442
      https://github.com/phpmyadmin/phpmyadmin/commit/d510e19e7788435c101abc8026b75bbdfc063442
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-16 (Tue, 16 Sep 2014)

  Changed paths:
    M libraries/StringMB.class.php
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Fix 14528: Fix SQL import.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M ChangeLog
    M js/ajax.js

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


  Commit: 30274535b4b1f482945ad6e11439e3e1f31fbe3a
      https://github.com/phpmyadmin/phpmyadmin/commit/30274535b4b1f482945ad6e11439e3e1f31fbe3a
  Author: dingo thirteen <dingo13 at gmail.com>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M po/nl.po

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

Currently translated at 98.9% (2933 of 2964)

[ci skip]


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

  Changed paths:
    M ChangeLog
    M js/ajax.js

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


  Commit: 176486c36c26fea7a54b7919bf1c1246b1dcf887
      https://github.com/phpmyadmin/phpmyadmin/commit/176486c36c26fea7a54b7919bf1c1246b1dcf887
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M ChangeLog
    M js/tbl_structure.js

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


  Commit: cf2de639f7f9e3cfca6c4a7262f717353afde130
      https://github.com/phpmyadmin/phpmyadmin/commit/cf2de639f7f9e3cfca6c4a7262f717353afde130
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M libraries/ip_allow_deny.lib.php

  Log Message:
  -----------
  Remove unused variable

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


  Commit: 75be2a0fc465a0063a1171261fb42db9eb38bd6c
      https://github.com/phpmyadmin/phpmyadmin/commit/75be2a0fc465a0063a1171261fb42db9eb38bd6c
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M libraries/StringMB.class.php
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Merge pull request #1360 from Tithugues/b4528_master

Fix 14528: Fix SQL import.


  Commit: 50aa2df9c20162bac28b4d6dce314a6056f872e4
      https://github.com/phpmyadmin/phpmyadmin/commit/50aa2df9c20162bac28b4d6dce314a6056f872e4
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-09-18 (Thu, 18 Sep 2014)

  Changed paths:
    M js/sql.js

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


  Commit: 9f43eb74f6d87048da46acd938eef8aeae57d7d2
      https://github.com/phpmyadmin/phpmyadmin/commit/9f43eb74f6d87048da46acd938eef8aeae57d7d2
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2014-09-18 (Thu, 18 Sep 2014)

  Changed paths:
    M po/nl.po

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

Currently translated at 98.9% (2934 of 2964)

[ci skip]


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

  Changed paths:
    M js/sql.js

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


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

  Changed paths:
    M libraries/common.inc.php
    M libraries/operations.lib.php
    R tbl_move_copy.php
    M tbl_operations.php

  Log Message:
  -----------
  Move include file to a function

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


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

  Changed paths:
    M libraries/operations.lib.php

  Log Message:
  -----------
  Remove dead code

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


  Commit: 446dd0cfd889859ba27a3c071243f797947b54ee
      https://github.com/phpmyadmin/phpmyadmin/commit/446dd0cfd889859ba27a3c071243f797947b54ee
  Author: dingo thirteen <dingo13 at gmail.com>
  Date:   2014-09-19 (Fri, 19 Sep 2014)

  Changed paths:
    M po/nl.po

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

Currently translated at 99.5% (2951 of 2964)

[ci skip]


  Commit: 42e9a4cbd7bc32167a100fb082c0cd1ba08a4058
      https://github.com/phpmyadmin/phpmyadmin/commit/42e9a4cbd7bc32167a100fb082c0cd1ba08a4058
  Author: Weblate <noreply at weblate.org>
  Date:   2014-09-19 (Fri, 19 Sep 2014)

  Changed paths:
    M libraries/operations.lib.php

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


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

  Log Message:
  -----------
  Merge commit 'ab9036f'


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

  Changed paths:
    M ChangeLog

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

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


  Commit: b1b9009d7fb0bee8482968d18bf188c2937419d0
      https://github.com/phpmyadmin/phpmyadmin/commit/b1b9009d7fb0bee8482968d18bf188c2937419d0
  Author: Kyeong Su Shin <cdac1234 at gmail.com>
  Date:   2014-09-20 (Sat, 20 Sep 2014)

  Changed paths:
    M po/ko.po

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

Currently translated at 80.1% (2375 of 2964)

[ci skip]


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

  Changed paths:
    M ChangeLog

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


  Commit: 22c44a2363464eefb320009a4f22d1e2307813a8
      https://github.com/phpmyadmin/phpmyadmin/commit/22c44a2363464eefb320009a4f22d1e2307813a8
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2014-09-20 (Sat, 20 Sep 2014)

  Changed paths:
    M js/ajax.js

  Log Message:
  -----------
  Fix bad line break in js (coding style)

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: 137c44a5db0e4716890546b81f89b167e54cc4d5
      https://github.com/phpmyadmin/phpmyadmin/commit/137c44a5db0e4716890546b81f89b167e54cc4d5
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2014-09-20 (Sat, 20 Sep 2014)

  Changed paths:
    M js/console.js

  Log Message:
  -----------
  Fix function was used before it was defined

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: 9187b754240e075421486afdd8e8a3b8c5616eb4
      https://github.com/phpmyadmin/phpmyadmin/commit/9187b754240e075421486afdd8e8a3b8c5616eb4
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2014-09-20 (Sat, 20 Sep 2014)

  Changed paths:
    M js/console.js

  Log Message:
  -----------
  Fix bad line breaks (coding style)

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: 447d763a48971586bec45af179528c0193a674a3
      https://github.com/phpmyadmin/phpmyadmin/commit/447d763a48971586bec45af179528c0193a674a3
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-20 (Sat, 20 Sep 2014)

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  PHPDoc modification.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 7723908f3f3037e61b7a3e7dfc0d52c0f9337146
      https://github.com/phpmyadmin/phpmyadmin/commit/7723908f3f3037e61b7a3e7dfc0d52c0f9337146
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-20 (Sat, 20 Sep 2014)

  Changed paths:
    M ChangeLog
    M js/ajax.js
    M js/console.js
    M po/ko.po

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: 73d376d14a3e68f05ac993e5603a8d0bbb41dd0b
      https://github.com/phpmyadmin/phpmyadmin/commit/73d376d14a3e68f05ac993e5603a8d0bbb41dd0b
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-20 (Sat, 20 Sep 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Remove old @todo.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M db_datadict.php

  Log Message:
  -----------
  Remove unneeded code

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


  Commit: 1347aa60e36f6d8f5860b7531ec24bc526d9b24b
      https://github.com/phpmyadmin/phpmyadmin/commit/1347aa60e36f6d8f5860b7531ec24bc526d9b24b
  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:
  -----------
  Fix merge conflict

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


  Commit: 9a72ea8426ec1e67d14092dff4f0eaf9338ffc05
      https://github.com/phpmyadmin/phpmyadmin/commit/9a72ea8426ec1e67d14092dff4f0eaf9338ffc05
  Author: dingo thirteen <dingo13 at gmail.com>
  Date:   2014-09-21 (Sun, 21 Sep 2014)

  Changed paths:
    M po/nl.po

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

Currently translated at 100.0% (2964 of 2964)

[ci skip]


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

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


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

  Changed paths:
    M libraries/Util.class.php

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

Conflicts:
	libraries/Util.class.php


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

  Changed paths:
    M js/makegrid.js

  Log Message:
  -----------
  Out of scope variable

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


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

  Changed paths:
    M po/ta.po

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

Currently translated at 39.7% (1179 of 2964)

[ci skip]

PhpMyAdmin கட்டமைப்பு சேமிப்பகம் முடக்கப்பட்டுள்ளது. %sஏனென்று அறிக%s.


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

  Changed paths:
    M po/ta.po

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

Currently translated at 39.8% (1180 of 2964)

[ci skip]

முதனிலை குறிப்பெழுத்தின் முன்னிருப்பு அடுக்குமுறை


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

  Changed paths:
    M po/ta.po

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

Currently translated at 39.8% (1182 of 2964)

[ci skip]

%s தரவுத்தளத்தின் ஒழுங்கமைவு


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

  Changed paths:
    M po/ta.po

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

Currently translated at 39.9% (1183 of 2964)

[ci skip]

PhpMyAdmin கட்டமைப்பு சேமிப்பகம் முடக்கப்பட்டுள்ளது. %sஏனென்று அறிக%s.


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

  Changed paths:
    M po/ta.po

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

Currently translated at 39.9% (1184 of 2964)

[ci skip]

<br>      அல்லது மாற்றாக எதேனும் தரவுத்தளத்தின் 'செயல்பாடுகள்' தத்தலுக்கு சென்று அங்கு அமைத்துக்கொள்க.


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

  Changed paths:
    M po/ta.po

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

Currently translated at 39.9% (1185 of 2964)

[ci skip]

GIS தரவை காட்சிப்படுத்துக


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

  Changed paths:
    M po/ta.po

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

Currently translated at 40.0% (1186 of 2964)

[ci skip]

பல்வேறு பிழை செய்திகள், சிலவற்றை காட்டவில்லை.


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

  Changed paths:
    M libraries/Font.class.php
    M libraries/Message.class.php

  Log Message:
  -----------
  Remove unused code

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


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

  Changed paths:
    M po/ta.po

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

Currently translated at 40.0% (1187 of 2964)

[ci skip]

அடுத்தமுறை தன்னிச்சையாகவே அறிவிக்கையை அனுப்புக.


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

  Changed paths:
    M libraries/Font.class.php
    M libraries/Message.class.php

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


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

  Changed paths:
    M index.php

  Log Message:
  -----------
  Fix code execution path warning

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


  Commit: 6d755d3e8e1825ea785ab412789cff0e1d68129f
      https://github.com/phpmyadmin/phpmyadmin/commit/6d755d3e8e1825ea785ab412789cff0e1d68129f
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M libraries/sqlparser.lib.php

  Log Message:
  -----------
  Removed dead code in sqlparser.lib.php

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


  Commit: d00ac27f75e23347abdc7ffcfde4a3ca44ec12b9
      https://github.com/phpmyadmin/phpmyadmin/commit/d00ac27f75e23347abdc7ffcfde4a3ca44ec12b9
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-09-24 (Wed, 24 Sep 2014)

  Changed paths:
    M js/functions.js
    M js/indexes.js
    M libraries/Table.class.php

  Log Message:
  -----------
  fix bug #4540 #4541

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


  Commit: e6b5e40a945d340c41535ef8368d689051c1b165
      https://github.com/phpmyadmin/phpmyadmin/commit/e6b5e40a945d340c41535ef8368d689051c1b165
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-09-24 (Wed, 24 Sep 2014)

  Changed paths:
    M js/functions.js
    M js/indexes.js
    M libraries/Table.class.php

  Log Message:
  -----------
  Merge pull request #1362 from smita786/master

fix bug #4540 #4541


  Commit: 4fcb6136c7efa98647445f312cad3e843c0dd2e0
      https://github.com/phpmyadmin/phpmyadmin/commit/4fcb6136c7efa98647445f312cad3e843c0dd2e0
  Author: Dong-bum Kim <dongbum at me.com>
  Date:   2014-09-24 (Wed, 24 Sep 2014)

  Changed paths:
    M po/ko.po

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

Currently translated at 80.3% (2383 of 2964)

[ci skip]


  Commit: 481f756a00e835ef67e5e3ff9afd5391c5533387
      https://github.com/phpmyadmin/phpmyadmin/commit/481f756a00e835ef67e5e3ff9afd5391c5533387
  Author: Internationalization Ro <i18nro at yahoo.com>
  Date:   2014-09-24 (Wed, 24 Sep 2014)

  Changed paths:
    M po/ro.po

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

Currently translated at 60.5% (1796 of 2964)

[ci skip]


  Commit: 1de2ceba4268a905a56ba914d6354c98087719d9
      https://github.com/phpmyadmin/phpmyadmin/commit/1de2ceba4268a905a56ba914d6354c98087719d9
  Author: Weblate <noreply at weblate.org>
  Date:   2014-09-24 (Wed, 24 Sep 2014)

  Changed paths:
    M js/functions.js
    M js/indexes.js
    M libraries/Table.class.php

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


  Commit: 0f74231fee71e7ac149176fe60f6f57067d85542
      https://github.com/phpmyadmin/phpmyadmin/commit/0f74231fee71e7ac149176fe60f6f57067d85542
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-24 (Wed, 24 Sep 2014)

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

  Log Message:
  -----------
  rfe #1251 Show "Overhead" with same precision for all tables

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


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

  Changed paths:
    M po/ro.po

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

Currently translated at 60.8% (1804 of 2964)

[ci skip]


  Commit: 023cb969ba1a3bab14a56c49f2c9432d1a7db316
      https://github.com/phpmyadmin/phpmyadmin/commit/023cb969ba1a3bab14a56c49f2c9432d1a7db316
  Author: Weblate <noreply at weblate.org>
  Date:   2014-09-24 (Wed, 24 Sep 2014)

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

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


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

  Log Message:
  -----------
  Merge commit '91a919e'


  Commit: ac08019ef44830c3623bdb7821b7d7377aa16a81
      https://github.com/phpmyadmin/phpmyadmin/commit/ac08019ef44830c3623bdb7821b7d7377aa16a81
  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:
  -----------
  Merge branch 'QA_4_2'


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

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

  Log Message:
  -----------
  Refactor duplicate code

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


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

  Changed paths:
    M libraries/mult_submits.inc.php
    M libraries/mult_submits.lib.php
    M test/libraries/PMA_mult_submits_test.php

  Log Message:
  -----------
  Fix parameter type; remove unused parameter

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


  Commit: 127e014930b8892bb9dd702c400c8a50e9362b7b
      https://github.com/phpmyadmin/phpmyadmin/commit/127e014930b8892bb9dd702c400c8a50e9362b7b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Fix parameter type

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


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

  Log Message:
  -----------
  Merge commit '911d852'


  Commit: cd2225c997baf634865b44dc8677b0f31e7be1db
      https://github.com/phpmyadmin/phpmyadmin/commit/cd2225c997baf634865b44dc8677b0f31e7be1db
  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:
  -----------
  Merge branch 'QA_4_2'


  Commit: 3cda5c959c1b38fc04f564270d41b823e6874427
      https://github.com/phpmyadmin/phpmyadmin/commit/3cda5c959c1b38fc04f564270d41b823e6874427
  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 60.9% (1808 of 2964)

[ci skip]


  Commit: 74709bb48e35faa012ea86ddd65b78e07171d90e
      https://github.com/phpmyadmin/phpmyadmin/commit/74709bb48e35faa012ea86ddd65b78e07171d90e
  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/master'


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

  Changed paths:
    M db_tracking.php
    R libraries/tbl_tracking.lib.php
    A libraries/tracking.lib.php
    M tbl_tracking.php

  Log Message:
  -----------
  Refactor duplicate code

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


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

  Changed paths:
    M test/libraries/PMA_tbl_tracking_test.php

  Log Message:
  -----------
  Fix test

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


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

  Changed paths:
    M scripts/create-release.sh

  Log Message:
  -----------
  Add the --stable option to explicitely mark a version as stable

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


  Commit: 8463a44bb08c35868a30b985bcee9be292c3eaf1
      https://github.com/phpmyadmin/phpmyadmin/commit/8463a44bb08c35868a30b985bcee9be292c3eaf1
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-28 (Sun, 28 Sep 2014)

  Changed paths:
    A libraries/string.lib.php
    A libraries/stringMb.lib.php
    A libraries/stringNative.lib.php
    A test/libraries/stringMb_test.php
    A test/libraries/stringNative_test.php
    A test/libraries/string_test_abstract.php

  Log Message:
  -----------
  Create new PMA mb_* functions and initialise unit tests.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: af2d548d19ecc74cd5001a8460db9afb22b91d98
      https://github.com/phpmyadmin/phpmyadmin/commit/af2d548d19ecc74cd5001a8460db9afb22b91d98
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-28 (Sun, 28 Sep 2014)

  Changed paths:
    M test/libraries/stringNative_test.php

  Log Message:
  -----------
  Fix typo.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 38eb5948a0e19991620b7d9c47c1dc0f284e291a
      https://github.com/phpmyadmin/phpmyadmin/commit/38eb5948a0e19991620b7d9c47c1dc0f284e291a
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-28 (Sun, 28 Sep 2014)

  Changed paths:
    M import_status.php

  Log Message:
  -----------
  Remove use of PMA_String in comments.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 3de88162ff628a50d220d559954362c21028cc65
      https://github.com/phpmyadmin/phpmyadmin/commit/3de88162ff628a50d220d559954362c21028cc65
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-28 (Sun, 28 Sep 2014)

  Changed paths:
    M changelog.php
    M db_operations.php
    M db_printview.php
    M examples/openid.php
    M export.php
    M file_echo.php
    M gis_data_editor.php
    M import.php
    M index.php
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    M libraries/DBQbe.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DbSearch.class.php
    M libraries/DisplayResults.class.php
    M libraries/Error.class.php
    M libraries/File.class.php
    M libraries/Font.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/Message.class.php
    M libraries/PDF.class.php
    M libraries/RecentFavoriteTable.class.php
    M libraries/Response.class.php
    M libraries/Scripts.class.php
    M libraries/ServerStatusData.class.php
    M libraries/StorageEngine.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Tracker.class.php
    M libraries/Types.class.php
    M libraries/Util.class.php
    M libraries/bookmark.lib.php
    M libraries/browse_foreigners.lib.php
    M libraries/build_html_for_db.lib.php
    M libraries/central_columns.lib.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/config/Form.class.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/FormDisplay.tpl.php
    M libraries/config/ServerConfigChecks.class.php
    M libraries/config/Validator.class.php
    M libraries/core.lib.php
    M libraries/db_common.inc.php
    M libraries/db_designer.lib.php
    M libraries/db_table_exists.lib.php
    M libraries/display_change_password.lib.php
    M libraries/display_export.lib.php
    M libraries/display_git_revision.lib.php
    M libraries/error_report.lib.php
    M libraries/export.lib.php
    M libraries/file_listing.lib.php
    M libraries/gis/GIS_Factory.class.php
    M libraries/gis/GIS_Geometry.class.php
    M libraries/gis/GIS_Geometrycollection.class.php
    M libraries/gis/GIS_Linestring.class.php
    M libraries/gis/GIS_Multilinestring.class.php
    M libraries/gis/GIS_Multipoint.class.php
    M libraries/gis/GIS_Multipolygon.class.php
    M libraries/gis/GIS_Point.class.php
    M libraries/gis/GIS_Polygon.class.php
    M libraries/gis/GIS_Visualization.class.php
    M libraries/iconv_wrapper.lib.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/ip_allow_deny.lib.php
    M libraries/mime.lib.php
    M libraries/mult_submits.inc.php
    M libraries/mult_submits.lib.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/normalization.lib.php
    M libraries/operations.lib.php
    M libraries/parse_analyze.inc.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/ImportPlugin.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/export/ExportCsv.class.php
    M libraries/plugins/export/ExportLatex.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportXml.class.php
    M libraries/plugins/export/TableProperty.class.php
    M libraries/plugins/import/ImportCsv.class.php
    M libraries/plugins/import/ImportMediawiki.class.php
    M libraries/plugins/import/ImportShp.class.php
    M libraries/plugins/import/ImportSql.class.php
    M libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
    M libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
    M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
    M libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
    M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
    M libraries/pmd_common.php
    M libraries/relation.lib.php
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_main.inc.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php
    M libraries/sanitizing.lib.php
    M libraries/select_lang.lib.php
    M libraries/server_databases.lib.php
    M libraries/server_plugins.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/server_status_processes.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_user_groups.lib.php
    M libraries/server_variables.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.lib.php
    M libraries/structure.lib.php
    M libraries/sysinfo.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_indexes.lib.php
    M libraries/tbl_info.inc.php
    M libraries/tbl_relation.lib.php
    M libraries/tbl_tracking.lib.php
    M libraries/transformations.lib.php
    M libraries/url_generating.lib.php
    M prefs_manage.php
    M scripts/decode_bug.php
    M setup/frames/index.inc.php
    M setup/lib/ConfigGenerator.class.php
    M sql.php
    M tbl_addfield.php
    M tbl_change.php
    M tbl_chart.php
    M tbl_create.php
    M tbl_get_field.php
    M tbl_operations.php
    M tbl_printview.php
    M transformation_wrapper.php

  Log Message:
  -----------
  Replace PMA_String uses by mb_* calls.
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 5926d94d87031144412c3fd293273da1420d8a47
      https://github.com/phpmyadmin/phpmyadmin/commit/5926d94d87031144412c3fd293273da1420d8a47
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-28 (Sun, 28 Sep 2014)

  Changed paths:
    M libraries/core.lib.php

  Log Message:
  -----------
  Add include to use PMA mb_* functions.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 019a20c868c24db95ff69686aea42114c43e5ac2
      https://github.com/phpmyadmin/phpmyadmin/commit/019a20c868c24db95ff69686aea42114c43e5ac2
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M libraries/stringNative.lib.php

  Log Message:
  -----------
  Coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M js/messages.php

  Log Message:
  -----------
  Do not pretend that sprintf in javascript supports ordering

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


  Commit: 9792a7f717bf9486f6d57a6c2c2e8ff3db96701b
      https://github.com/phpmyadmin/phpmyadmin/commit/9792a7f717bf9486f6d57a6c2c2e8ff3db96701b
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M libraries/core.lib.php

  Log Message:
  -----------
  Add include for string library in tests.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: aae1b30d62393cc0da8e51a519f0d3aa14ef4e22
      https://github.com/phpmyadmin/phpmyadmin/commit/aae1b30d62393cc0da8e51a519f0d3aa14ef4e22
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M js/export.js
    M libraries/display_export.lib.php

  Log Message:
  -----------
  fix export with more than 1000 input fields (db/table/column alias)

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: 027603204f3cb4e4e0ef6cc117e4dfd555eb6ee5
      https://github.com/phpmyadmin/phpmyadmin/commit/027603204f3cb4e4e0ef6cc117e4dfd555eb6ee5
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M libraries/stringNative.lib.php

  Log Message:
  -----------
  Merge branch 'stringFunctions_master' of https://github.com/Tithugues/phpmyadmin into stringFunctions_master


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

  Changed paths:
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Remove dead code

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


  Commit: 0ee7063220f54c4b125f2731bb3579b93438c4d1
      https://github.com/phpmyadmin/phpmyadmin/commit/0ee7063220f54c4b125f2731bb3579b93438c4d1
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M test/classes/PMA_Config_test.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    M test/libraries/PMA_central_columns_test.php
    M test/libraries/PMA_display_export_test.php
    M test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/core/PMA_warnMissingExtension_test.php
    M test/selenium/PmaSeleniumTableInsertTest.php
    M test/selenium/PmaSeleniumXssTest.php
    M test/selenium/TestBase.php

  Log Message:
  -----------
  Replace PMA_String calls by mb_* calls in tests.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 5c67267a11ce1bb72a097c6cc649f2dd58902030
      https://github.com/phpmyadmin/phpmyadmin/commit/5c67267a11ce1bb72a097c6cc649f2dd58902030
  Author: Chirayu Chiripal <D-storm at users.noreply.github.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M js/export.js
    M libraries/display_export.lib.php

  Log Message:
  -----------
  Merge pull request #1363 from D-storm/export

fix export with more than 1000 input fields (db/table/column alias)


  Commit: 9f79ac3c739de2655ec7c834b21ce0682ee56c0d
      https://github.com/phpmyadmin/phpmyadmin/commit/9f79ac3c739de2655ec7c834b21ce0682ee56c0d
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-29 (Mon, 29 Sep 2014)

  Changed paths:
    M libraries/Util.class.php

  Log Message:
  -----------
  Revert use of multibytes functions to get compression mime type.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Log Message:
  -----------
  Merge commit 'd21b4c0'


  Commit: faafea0bd186441464d94efa83ed7b6bc3cc5531
      https://github.com/phpmyadmin/phpmyadmin/commit/faafea0bd186441464d94efa83ed7b6bc3cc5531
  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:
  -----------
  Merge branch 'QA_4_2'


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

  Changed paths:
    M libraries/structure.lib.php

  Log Message:
  -----------
  Adapt to PMA_String

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


  Commit: fd6e7cf4e14612d88242cccb7750f1d495bcb19e
      https://github.com/phpmyadmin/phpmyadmin/commit/fd6e7cf4e14612d88242cccb7750f1d495bcb19e
  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:
  -----------
  resolve merge conflict

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


  Commit: 74bc298d20e475409dc28a7b66e3c6beae5779cc
      https://github.com/phpmyadmin/phpmyadmin/commit/74bc298d20e475409dc28a7b66e3c6beae5779cc
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-30 (Tue, 30 Sep 2014)

  Changed paths:
    M libraries/stringNative.lib.php

  Log Message:
  -----------
  Improve mb_substr using native substr.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: bb85376b89e508635e015204afbd5fb8b52275a3
      https://github.com/phpmyadmin/phpmyadmin/commit/bb85376b89e508635e015204afbd5fb8b52275a3
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-30 (Tue, 30 Sep 2014)

  Changed paths:
    M test/classes/plugin/import/ImportCsv_test.php

  Log Message:
  -----------
  Minor PHPDoc modification.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: fe7b5bb23d77dd0f14229460fd57318bd487e3f4
      https://github.com/phpmyadmin/phpmyadmin/commit/fe7b5bb23d77dd0f14229460fd57318bd487e3f4
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-09-30 (Tue, 30 Sep 2014)

  Changed paths:
    M libraries/plugins/import/ImportCsv.class.php

  Log Message:
  -----------
  Replace uses of string iterators by use of mb_substr.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 1122ed52ec4c36d3d2e39b2bb5e899e1014bd221
      https://github.com/phpmyadmin/phpmyadmin/commit/1122ed52ec4c36d3d2e39b2bb5e899e1014bd221
  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 82.6% (2449 of 2964)

[ci skip]


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

  Changed paths:
    M libraries/rte/rte_footer.lib.php
    A themes/original/img/bd_routine_add.png
    A themes/pmahomme/img/bd_routine_add.png

  Log Message:
  -----------
  Disable new link when there is no privilege to create procedure

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


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

  Changed paths:
    M libraries/rte/rte_list.lib.php

  Log Message:
  -----------
  Since editing a procedure involved dropping and recreating, check also for CREATE ROUTINE privilege to avoid lost procedures

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


  Commit: b00f88f0731e3b0d4308adba3aa3417ccfc9d075
      https://github.com/phpmyadmin/phpmyadmin/commit/b00f88f0731e3b0d4308adba3aa3417ccfc9d075
  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 91.4% (2711 of 2964)

[ci skip]


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

  Changed paths:
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_list.lib.php
    A themes/original/img/bd_routine_add.png
    A themes/pmahomme/img/bd_routine_add.png

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


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

  Changed paths:
    M libraries/rte/rte_routines.lib.php

  Log Message:
  -----------
  Avoid notices due to lack of privileges

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


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

  Changed paths:
    M po/en_GB.po

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


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

  Changed paths:
    M libraries/rte/rte_list.lib.php

  Log Message:
  -----------
  Enable Execute link based on EXECUTE privilege

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


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

  Changed paths:
    M libraries/rte/rte_footer.lib.php

  Log Message:
  -----------
  Pass table to check privileges

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


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

  Log Message:
  -----------
  Merge commit 'dbdd905'


  Commit: f152146abe3163b8817769b4ec57c12d33807598
      https://github.com/phpmyadmin/phpmyadmin/commit/f152146abe3163b8817769b4ec57c12d33807598
  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


  Commit: ff4be7ee5a71f29921089d447e658630ef7cbfef
      https://github.com/phpmyadmin/phpmyadmin/commit/ff4be7ee5a71f29921089d447e658630ef7cbfef
  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: 6c83a2f2e396524da9153225617c30affbe07540
      https://github.com/phpmyadmin/phpmyadmin/commit/6c83a2f2e396524da9153225617c30affbe07540
  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:
  -----------
  Merge commit 'a020eac11a26977295cf2439ddd2e5b4af2c88fe'

Conflicts:
	js/config.js
	js/db_search.js
	js/functions.js
	js/makegrid.js
	js/server_privileges.js
	js/tbl_structure.js


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

  Log Message:
  -----------
  Merge commit '01c7f4e3f1433fb7365413f4e8dc5fea57e8fd76'


  Commit: b5bceca386aac516943a514bdd0f75fbb4c323cd
      https://github.com/phpmyadmin/phpmyadmin/commit/b5bceca386aac516943a514bdd0f75fbb4c323cd
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M po/et.po

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

Currently translated at 100.0% (2964 of 2964)

[ci skip]


  Commit: 1814c53e5f130de0d4b6a68437fe78173820b800
      https://github.com/phpmyadmin/phpmyadmin/commit/1814c53e5f130de0d4b6a68437fe78173820b800
  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/master'


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

  Log Message:
  -----------
  Merge commit '9cb2f3e'


  Commit: b9996c565705284ea70850f9b2963b40e861746b
      https://github.com/phpmyadmin/phpmyadmin/commit/b9996c565705284ea70850f9b2963b40e861746b
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M doc/credits.rst

  Log Message:
  -----------
  Give credits to GSoC 2014 students

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: 53e0d9b79bffdc3856123361388808a23608f835
      https://github.com/phpmyadmin/phpmyadmin/commit/53e0d9b79bffdc3856123361388808a23608f835
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php

  Log Message:
  -----------
  Cast date split.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M config.sample.inc.php

  Log Message:
  -----------
  Align

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


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

  Changed paths:
    M doc/credits.rst
    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/TableSearch.class.php
    M libraries/Util.class.php
    M po/et.po

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


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

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

  Log Message:
  -----------
  bug #4537 BLOB inline-view JPG column transformation does not work for anything except simple queries

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


  Commit: f96841ebf4483065fdaecab4d516efabf688def2
      https://github.com/phpmyadmin/phpmyadmin/commit/f96841ebf4483065fdaecab4d516efabf688def2
  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:
  -----------
  Merge branch 'QA_4_2'


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

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


  Commit: 1552d32830275552de234c0682b829b45e429f9e
      https://github.com/phpmyadmin/phpmyadmin/commit/1552d32830275552de234c0682b829b45e429f9e
  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/ne.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: d87dc01a0f26bb8122605c33c0395e3a6cf27b0e
      https://github.com/phpmyadmin/phpmyadmin/commit/d87dc01a0f26bb8122605c33c0395e3a6cf27b0e
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M libraries/Table.class.php

  Log Message:
  -----------
  Fix typo

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


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

  Changed paths:
    M scripts/advisor2po

  Log Message:
  -----------
  Work with new strings abstraction layer

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


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

  Changed paths:
    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/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    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:
  -----------
  Update po files


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

  Changed paths:
    M libraries/structure.lib.php

  Log Message:
  -----------
  Fix coding style

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


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

  Changed paths:
    M po/fr.po

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

Currently translated at 99.9% (2963 of 2965 strings)

[CI skip]


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

  Changed paths:
    M po/ro.po

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

Currently translated at 60.9% (1807 of 2965 strings)

[CI skip]


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

  Changed paths:
    M libraries/structure.lib.php

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


  Commit: 7336975ef196c46a1796c5a7d0a18438841aecf0
      https://github.com/phpmyadmin/phpmyadmin/commit/7336975ef196c46a1796c5a7d0a18438841aecf0
  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% (2965 of 2965 strings)

[CI skip]


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

  Changed paths:
    M po/ksh.po

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

Currently translated at 0.9% (29 of 2964)

[ci skip]


  Commit: fafa87ca6f8ad9bda338f31a41e77b09bc0fc6e9
      https://github.com/phpmyadmin/phpmyadmin/commit/fafa87ca6f8ad9bda338f31a41e77b09bc0fc6e9
  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% (2964 of 2964)

[ci skip]


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

  Changed paths:
    M po/tr.po

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

Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]


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

  Changed paths:
    M libraries/Table.class.php

  Log Message:
  -----------
  Avoid undefined index notice

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


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

  Changed paths:
    M po/tr.po

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: bcc8df3182305aebbf48fe7e11dbcdad1571f207
      https://github.com/phpmyadmin/phpmyadmin/commit/bcc8df3182305aebbf48fe7e11dbcdad1571f207
  Author: Xavier Navarro <xvnavarro at gmail.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M po/ca.po

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

Currently translated at 78.4% (2327 of 2965 strings)

[CI skip]


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

  Changed paths:
    M po/tr.po

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

Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]


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

  Changed paths:
    M libraries/Table.class.php

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


  Commit: 92f774216ae989fde7d8e30dd8ccb04dce1093f1
      https://github.com/phpmyadmin/phpmyadmin/commit/92f774216ae989fde7d8e30dd8ccb04dce1093f1
  Author: Domen <mitenem at outlook.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M po/sl.po

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

Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]


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

  Changed paths:
    M js/server_privileges.js
    M libraries/server_privileges.lib.php
    M server_privileges.php

  Log Message:
  -----------
  Cleanup add user functionality

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


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

  Changed paths:
    M js/server_privileges.js
    M libraries/display_change_password.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_user_groups.lib.php
    M server_privileges.php

  Log Message:
  -----------
  Cleanup edit privilege functionality

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


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

  Changed paths:
    M js/server_privileges.js

  Log Message:
  -----------
  Scroll to the top when sub menus are created

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


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

  Changed paths:
    M ChangeLog
    M js/ajax.js
    M js/common.js
    M js/config.js
    M js/db_qbe.js
    M js/db_structure.js
    M js/functions.js
    M js/gis_data_editor.js
    R js/jquery/jquery.sprintf.js
    M js/normalization.js
    M js/pmd/move.js
    M js/server_databases.js
    M js/server_privileges.js
    M js/server_status_monitor.js
    M js/server_user_groups.js
    A js/sprintf.js
    M js/sql.js
    M js/tbl_relation.js
    M js/tbl_structure.js
    M libraries/Header.class.php
    M libraries/display_import.lib.php

  Log Message:
  -----------
  Feature#1546 Replace js sprintf library with a better one

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


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

  Changed paths:
    M ChangeLog
    M db_designer.php
    M libraries/pmd_common.php

  Log Message:
  -----------
  rfe #1542 Better error reporting in Designer

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


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

  Changed paths:
    M ChangeLog
    M js/ajax.js
    M js/common.js
    M js/config.js
    M js/db_qbe.js
    M js/db_structure.js
    M js/functions.js
    M js/gis_data_editor.js
    R js/jquery/jquery.sprintf.js
    M js/normalization.js
    M js/pmd/move.js
    M js/server_databases.js
    M js/server_privileges.js
    M js/server_status_monitor.js
    M js/server_user_groups.js
    A js/sprintf.js
    M js/sql.js
    M js/tbl_relation.js
    M js/tbl_structure.js
    M libraries/Header.class.php
    M libraries/display_import.lib.php

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

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


  Commit: 035e34021afad6c254a52c6872edff57072d1ca0
      https://github.com/phpmyadmin/phpmyadmin/commit/035e34021afad6c254a52c6872edff57072d1ca0
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M js/sprintf.js

  Log Message:
  -----------
  Add licencing info to js/sprintf.js from https://github.com/kvz/phpjs/blob/master/LICENSE.txt

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


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

  Changed paths:
    M libraries/pmd_common.php

  Log Message:
  -----------
  Warn about missing indexes on column

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


  Commit: 2ee9898f2093bb67c6041eafa49fdfcac32221d3
      https://github.com/phpmyadmin/phpmyadmin/commit/2ee9898f2093bb67c6041eafa49fdfcac32221d3
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  fix mousemove conflict:bug#4549

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


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

  Changed paths:
    M ChangeLog
    M db_designer.php
    M libraries/pmd_common.php

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


  Commit: 127a476be2632530af3dfad8beccc823c1f3cf39
      https://github.com/phpmyadmin/phpmyadmin/commit/127a476be2632530af3dfad8beccc823c1f3cf39
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Merge pull request #1369 from smita786/master

fix mousemove conflict:bug#4549


  Commit: 54f4af1d885fd3795d765057f588f7bd47407ab7
      https://github.com/phpmyadmin/phpmyadmin/commit/54f4af1d885fd3795d765057f588f7bd47407ab7
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M js/functions.js

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


  Commit: 360018e0f4c019167b82044778a580864164c37e
      https://github.com/phpmyadmin/phpmyadmin/commit/360018e0f4c019167b82044778a580864164c37e
  Author: Xavier Navarro <xvnavarro at gmail.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M po/ca.po

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

Currently translated at 81.2% (2409 of 2965 strings)

[CI skip]


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

  Changed paths:
    M js/sprintf.js

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


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

  Changed paths:
    M libraries/db_designer.lib.php

  Log Message:
  -----------
  Add missing quotes

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


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

  Changed paths:
    M js/sprintf.js
    M po/ca.po

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


  Commit: 6eebc21466492d6a00abc39f245a3d446a2cc6ca
      https://github.com/phpmyadmin/phpmyadmin/commit/6eebc21466492d6a00abc39f245a3d446a2cc6ca
  Author: Xavier Navarro <xvnavarro at gmail.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M po/ca.po

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

Currently translated at 81.5% (2417 of 2965 strings)

[CI skip]


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

  Changed paths:
    M libraries/db_designer.lib.php

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


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

  Changed paths:
    M js/server_privileges.js
    M libraries/display_change_password.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_user_groups.lib.php
    M server_privileges.php

  Log Message:
  -----------
  Merge pull request #1367 from madhuracj/Bug4547

Fix for bug #4547


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

  Changed paths:
    M ChangeLog

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

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


  Commit: 65791f5ecb0f5dc0033bf402f58fedf5fd1cc824
      https://github.com/phpmyadmin/phpmyadmin/commit/65791f5ecb0f5dc0033bf402f58fedf5fd1cc824
  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 98.5% (2922 of 2965 strings)

[CI skip]


  Commit: e20510de39695bdaf66cf8b57390a86f03505340
      https://github.com/phpmyadmin/phpmyadmin/commit/e20510de39695bdaf66cf8b57390a86f03505340
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M index.php
    M libraries/Config.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DisplayResults.class.php
    M libraries/check_user_privileges.lib.php
    M libraries/core.lib.php
    M libraries/display_export.lib.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  Replace mb functions by standard string functions.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M ChangeLog
    M README.rst
    M db_designer.php
    M doc/faq.rst
    M js/ajax.js
    M js/common.js
    M js/config.js
    M js/db_qbe.js
    M js/db_structure.js
    M js/functions.js
    M js/gis_data_editor.js
    R js/jquery/jquery.sprintf.js
    M js/normalization.js
    M js/pmd/move.js
    M js/server_databases.js
    M js/server_privileges.js
    M js/server_status_monitor.js
    M js/server_user_groups.js
    A js/sprintf.js
    M js/sql.js
    M js/tbl_relation.js
    M js/tbl_structure.js
    M libraries/Header.class.php
    M libraries/Table.class.php
    M libraries/db_designer.lib.php
    M libraries/display_change_password.lib.php
    M libraries/display_import.lib.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/pmd_common.php
    M libraries/server_privileges.lib.php
    M libraries/server_user_groups.lib.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/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    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 scripts/advisor2po
    M server_privileges.php

  Log Message:
  -----------
  Merge branch 'master' into Bug4537

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


  Commit: 4e68ada908a39c83feb4601358f3ef5727b265d1
      https://github.com/phpmyadmin/phpmyadmin/commit/4e68ada908a39c83feb4601358f3ef5727b265d1
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M index.php
    M libraries/display_create_database.lib.php
    M libraries/mysql_charsets.lib.php
    M libraries/operations.lib.php
    M libraries/tbl_columns_definition_form.lib.php
    M test/libraries/PMA_mysql_charsets_test.php

  Log Message:
  -----------
  Remove dead codes

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


  Commit: 49ababac08dfc8e901c78eca97a95c0c83654613
      https://github.com/phpmyadmin/phpmyadmin/commit/49ababac08dfc8e901c78eca97a95c0c83654613
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M changelog.php
    M gis_data_editor.php
    M import.php
    M index.php
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    M transformation_wrapper.php

  Log Message:
  -----------
  Replace mb functions by standard string functions.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M libraries/insert_edit.lib.php
    M tbl_change.php
    M test/libraries/PMA_insert_edit_test.php

  Log Message:
  -----------
  Refactor: we had three similar functions, refactored into just one.

Also, these functions returned false, or a string containing the type,
but the string was only used to indirectly mean a true value; now
we explicitely return true in this case.

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


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

  Changed paths:
    M db_designer.php

  Log Message:
  -----------
  'same' and 'new' are the only choices here

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


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

  Changed paths:
    M db_operations.php

  Log Message:
  -----------
  Define $message in all paths

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


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

  Changed paths:
    M db_operations.php

  Log Message:
  -----------
  Define $sql_query in all paths

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


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

  Changed paths:
    M js/pmd/move.js

  Log Message:
  -----------
  Fix bad line breaks

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


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

  Changed paths:
    M js/navigation.js

  Log Message:
  -----------
  Avoid bad line breaks

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


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

  Changed paths:
    M index.php
    M libraries/display_create_database.lib.php
    M libraries/insert_edit.lib.php
    M libraries/mysql_charsets.lib.php
    M libraries/operations.lib.php
    M libraries/tbl_columns_definition_form.lib.php
    M tbl_change.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_mysql_charsets_test.php

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


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

  Changed paths:
    M libraries/tbl_relation.lib.php
    M tbl_relation.php

  Log Message:
  -----------
  Function does not handle null values even if it was documented to handle them

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


  Commit: 48bd3b8ee505a50014ae62236235e73034b39e9c
      https://github.com/phpmyadmin/phpmyadmin/commit/48bd3b8ee505a50014ae62236235e73034b39e9c
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-05 (Sun, 05 Oct 2014)

  Changed paths:
    M libraries/DBQbe.class.php
    M libraries/DisplayResults.class.php
    M libraries/Menu.class.php
    M libraries/ServerStatusData.class.php
    M libraries/StorageEngine.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Tracker.class.php
    M libraries/Util.class.php
    M libraries/config/Form.class.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/Validator.class.php
    M libraries/display_change_password.lib.php
    M libraries/display_export.lib.php
    M libraries/gis/GIS_Factory.class.php
    M libraries/gis/GIS_Geometry.class.php
    M libraries/gis/GIS_Geometrycollection.class.php
    M libraries/gis/GIS_Linestring.class.php
    M libraries/gis/GIS_Multilinestring.class.php
    M libraries/gis/GIS_Multipoint.class.php
    M libraries/gis/GIS_Multipolygon.class.php
    M libraries/gis/GIS_Point.class.php
    M libraries/gis/GIS_Polygon.class.php
    M libraries/gis/GIS_Visualization.class.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/mime.lib.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/relation.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php
    M libraries/sanitizing.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status_processes.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_user_groups.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.lib.php
    M libraries/sysinfo.lib.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_indexes.lib.php
    M libraries/tbl_relation.lib.php
    M libraries/tbl_tracking.lib.php
    M libraries/transformations.lib.php
    M libraries/url_generating.lib.php

  Log Message:
  -----------
  Remove unused $pmaString.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: f9cd1a1a227d193dc8a70decb8e59607deb3e165
      https://github.com/phpmyadmin/phpmyadmin/commit/f9cd1a1a227d193dc8a70decb8e59607deb3e165
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-05 (Sun, 05 Oct 2014)

  Changed paths:
    M libraries/Config.class.php
    M libraries/Error.class.php
    M libraries/TableSearch.class.php
    M libraries/Tracker.class.php
    M libraries/Util.class.php
    M libraries/display_change_password.lib.php
    M libraries/display_git_revision.lib.php
    M libraries/export.lib.php
    M libraries/file_listing.lib.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_user_groups.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_relation.lib.php

  Log Message:
  -----------
  Replace mb functions by standard string functions.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 95f4ed15586f8648cef9beda93a70b30539768d4
      https://github.com/phpmyadmin/phpmyadmin/commit/95f4ed15586f8648cef9beda93a70b30539768d4
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-05 (Sun, 05 Oct 2014)

  Changed paths:
    M libraries/Menu.class.php
    M libraries/insert_edit.lib.php
    M libraries/mime.lib.php
    M libraries/sanitizing.lib.php
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Replace mb functions by standard string functions.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 9ca79b379de130dcdbdd531855d5e8cef2ba5f05
      https://github.com/phpmyadmin/phpmyadmin/commit/9ca79b379de130dcdbdd531855d5e8cef2ba5f05
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-05 (Sun, 05 Oct 2014)

  Changed paths:
    M libraries/Scripts.class.php
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Replace mb functions by standard string functions.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 043aae9dbade86921681290aa9cd3aa2755d9d1e
      https://github.com/phpmyadmin/phpmyadmin/commit/043aae9dbade86921681290aa9cd3aa2755d9d1e
  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 81.5% (2417 of 2965 strings)

[CI skip]


  Commit: 66be2f7699c502628ab06f01c7156b34d76b92e3
      https://github.com/phpmyadmin/phpmyadmin/commit/66be2f7699c502628ab06f01c7156b34d76b92e3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-05 (Sun, 05 Oct 2014)

  Changed paths:
    M db_operations.php

  Log Message:
  -----------
  Fix code execution path warning

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


  Commit: 4749ee4e733191b40350bc99a8c74017a7e3884d
      https://github.com/phpmyadmin/phpmyadmin/commit/4749ee4e733191b40350bc99a8c74017a7e3884d
  Author: josep constanti <jconstanti at ovi.com>
  Date:   2014-10-05 (Sun, 05 Oct 2014)

  Changed paths:
    M po/ca.po

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

Currently translated at 81.6% (2420 of 2965 strings)

[CI skip]


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

  Changed paths:
    M db_operations.php

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


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

  Changed paths:
    M view_create.php

  Log Message:
  -----------
  Fix code execution path warning

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


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

  Changed paths:
    M po/ca.po

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


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

  Changed paths:
    M ChangeLog
    M libraries/DisplayResults.class.php
    M libraries/Util.class.php
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  bug #4551 Wrong test in source code

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


  Commit: a0f6c46292e82ff2eb6e0e5f6c525f52d6bb0a34
      https://github.com/phpmyadmin/phpmyadmin/commit/a0f6c46292e82ff2eb6e0e5f6c525f52d6bb0a34
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

  Changed paths:
    M libraries/TableSearch.class.php

  Log Message:
  -----------
  Remove dead codes

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


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

  Changed paths:
    M ChangeLog
    M db_designer.php
    M db_operations.php
    M index.php
    M js/navigation.js
    M js/pmd/move.js
    M libraries/DisplayResults.class.php
    M libraries/TableSearch.class.php
    M libraries/Util.class.php
    M libraries/display_create_database.lib.php
    M libraries/insert_edit.lib.php
    M libraries/mysql_charsets.lib.php
    M libraries/operations.lib.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_relation.lib.php
    M po/ca.po
    M tbl_change.php
    M tbl_relation.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_mysql_charsets_test.php
    M view_create.php

  Log Message:
  -----------
  Merge branch 'master' into Bug4537

Conflicts:
	ChangeLog


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

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

  Log Message:
  -----------
  Merge pull request #1368 from madhuracj/Bug4537

bug #4537 BLOB inline-view JPG column transformation does not work for anything except simple queries


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

  Changed paths:
    M js/indexes.js
    M libraries/tbl_columns_definition_form.inc.php
    M libraries/tbl_columns_definition_form.lib.php

  Log Message:
  -----------
  Add index dialog does not open on choosing index from create table page

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


  Commit: bf63a462cc068be2e48ef0ebf03fd76756a2b961
      https://github.com/phpmyadmin/phpmyadmin/commit/bf63a462cc068be2e48ef0ebf03fd76756a2b961
  Author: Nisarg Jhaveri <nisarg.jhaveri at research.iiit.ac.in>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

  Changed paths:
    A js/codemirror/addon/hint/show-hint.js
    A js/codemirror/addon/hint/sql-hint.js
    M js/console.js
    M js/functions.js
    M libraries/Console.class.php
    M libraries/Header.class.php
    M themes/pmahomme/css/codemirror.css.php

  Log Message:
  -----------
  Basic autocomplete in SQL Query editor

- Autocomplete SQL keywords using CodeMirror hint addon
- Inline, footer SQL editors are not included
- Table/Database names completion is not implemented
- Added autocompletion to console, inline SQL editor, create view dialogue
- Autocomplete on `inputRead` instead of `change` event.

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri at research.iiit.ac.in>


  Commit: 7f99c14f5d41585d9426e52b2013d795031b376a
      https://github.com/phpmyadmin/phpmyadmin/commit/7f99c14f5d41585d9426e52b2013d795031b376a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-06 (Mon, 06 Oct 2014)

  Changed paths:
    M ChangeLog

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

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


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

  Changed paths:
    M ChangeLog
    A js/codemirror/addon/hint/show-hint.js
    A js/codemirror/addon/hint/sql-hint.js
    M js/console.js
    M js/functions.js
    M libraries/Console.class.php
    M libraries/DisplayResults.class.php
    M libraries/Header.class.php
    M libraries/Util.class.php
    M themes/pmahomme/css/codemirror.css.php

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


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

  Changed paths:
    M test/libraries/PMA_tbl_columns_definition_form_test.php

  Log Message:
  -----------
  Update tests

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


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

  Changed paths:
    M test/libraries/PMA_tbl_columns_definition_form_test.php

  Log Message:
  -----------
  Fix more failing tests

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


  Commit: 5c467a3de0929ac878db2e8375edb150bc08cf32
      https://github.com/phpmyadmin/phpmyadmin/commit/5c467a3de0929ac878db2e8375edb150bc08cf32
  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 59.7% (1773 of 2965 strings)

[CI skip]


  Commit: dd72db3c890d5d7ba8b030c5725da099b0faf9d0
      https://github.com/phpmyadmin/phpmyadmin/commit/dd72db3c890d5d7ba8b030c5725da099b0faf9d0
  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 79.3% (2352 of 2965 strings)

[CI skip]


  Commit: 9e816eba5dba5abdbe7c713d4b412a67aaf99433
      https://github.com/phpmyadmin/phpmyadmin/commit/9e816eba5dba5abdbe7c713d4b412a67aaf99433
  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 99.6% (2955 of 2965 strings)

[CI skip]


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

  Changed paths:
    M test/libraries/PMA_tbl_columns_definition_form_test.php

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


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

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

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

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


  Commit: a12e35291614dbd8a2d3cb0b3f07438191c1bbf0
      https://github.com/phpmyadmin/phpmyadmin/commit/a12e35291614dbd8a2d3cb0b3f07438191c1bbf0
  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 99.9% (2963 of 2965 strings)

[CI skip]


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

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

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


  Commit: 2224e00c84e0f37789b2fcf6ca0a2862c9044a3d
      https://github.com/phpmyadmin/phpmyadmin/commit/2224e00c84e0f37789b2fcf6ca0a2862c9044a3d
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M doc/config.rst

  Log Message:
  -----------
  Fix typo

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


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

  Changed paths:
    M libraries/TableSearch.class.php

  Log Message:
  -----------
  Align docs

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


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

  Changed paths:
    M libraries/mysql_charsets.lib.php

  Log Message:
  -----------
  Remove extra variables form doc

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


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

  Changed paths:
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  CodeSniffer doesn't like this comment

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


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

  Changed paths:
    M libraries/rte/rte_footer.lib.php

  Log Message:
  -----------
  Add spaces around concat

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


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

  Changed paths:
    M libraries/plugin_interface.lib.php

  Log Message:
  -----------
  Fix function name

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


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

  Changed paths:
    M libraries/server_status_monitor.lib.php

  Log Message:
  -----------
  Fix function name

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


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

  Changed paths:
    M libraries/sqlparser.lib.php

  Log Message:
  -----------
  Function names adhering to coding standards

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


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

  Changed paths:
    M test/libraries/common/PMA_generateHiddenMaxFileSize_test.php

  Log Message:
  -----------
  Function name

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


  Commit: b96fd99e0cf30d623fed75961222c87265cd6077
      https://github.com/phpmyadmin/phpmyadmin/commit/b96fd99e0cf30d623fed75961222c87265cd6077
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M po/nl.po

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

Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]


  Commit: 39fe63500d5fe84c73d9fe65802aad97f3fe57a1
      https://github.com/phpmyadmin/phpmyadmin/commit/39fe63500d5fe84c73d9fe65802aad97f3fe57a1
  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: c94915ae92ec8ca5e547db0655661fc474667558
      https://github.com/phpmyadmin/phpmyadmin/commit/c94915ae92ec8ca5e547db0655661fc474667558
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Log Message:
  -----------
  Merge commit 'eefd44a'


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

  Log Message:
  -----------
  Merge commit 'd2b9979'


  Commit: bb655d0c57e09b09edeeacb59b2e165a7b7d2c76
      https://github.com/phpmyadmin/phpmyadmin/commit/bb655d0c57e09b09edeeacb59b2e165a7b7d2c76
  Author: Marc Delisle <marc at 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


  Commit: 041501487bf2bb592a2149cd6404b3976476c198
      https://github.com/phpmyadmin/phpmyadmin/commit/041501487bf2bb592a2149cd6404b3976476c198
  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 89.4% (2651 of 2965 strings)

[CI skip]


  Commit: 6a6ab41c601ec614da6faf915183acbf4275b745
      https://github.com/phpmyadmin/phpmyadmin/commit/6a6ab41c601ec614da6faf915183acbf4275b745
  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/master'


  Commit: 3ea2e7d81fc009f81b2d0b2605020382a7ceb080
      https://github.com/phpmyadmin/phpmyadmin/commit/3ea2e7d81fc009f81b2d0b2605020382a7ceb080
  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:
  -----------
   rfe #3120 Events are not exported when using xml

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


  Commit: c4001e8c62cd7e16067d5fe489a1cd628228ef17
      https://github.com/phpmyadmin/phpmyadmin/commit/c4001e8c62cd7e16067d5fe489a1cd628228ef17
  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/de.po
    M po/nl.po

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


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  This is a bug

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


  Commit: 795c6c607677e332b32dec7d22da991a26e531bb
      https://github.com/phpmyadmin/phpmyadmin/commit/795c6c607677e332b32dec7d22da991a26e531bb
  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 tests

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


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

  Changed paths:
    M ChangeLog

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

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


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

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


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

  Changed paths:
    M js/makegrid.js

  Log Message:
  -----------
  Merge commit '536d4ef'


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

  Log Message:
  -----------
  Merge commit '21032ab'


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

  Changed paths:
    M ChangeLog

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


  Commit: 6a658f0410c4495a543d26856a0a422406b2030a
      https://github.com/phpmyadmin/phpmyadmin/commit/6a658f0410c4495a543d26856a0a422406b2030a
  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 90.2% (2677 of 2965 strings)

[CI skip]


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

  Changed paths:
    M ChangeLog
    M js/makegrid.js

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


  Commit: 70a21ec25cd8ab9abbda5f47c424440a6a43d399
      https://github.com/phpmyadmin/phpmyadmin/commit/70a21ec25cd8ab9abbda5f47c424440a6a43d399
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M ChangeLog
    M README.rst
    M config.sample.inc.php
    M db_designer.php
    M db_operations.php
    M db_tracking.php
    M doc/config.rst
    M doc/credits.rst
    M doc/faq.rst
    M export.php
    M index.php
    M js/ajax.js
    A js/codemirror/addon/hint/show-hint.js
    A js/codemirror/addon/hint/sql-hint.js
    M js/common.js
    M js/config.js
    M js/console.js
    M js/db_operations.js
    M js/db_qbe.js
    M js/db_search.js
    M js/db_structure.js
    M js/export.js
    M js/functions.js
    M js/gis_data_editor.js
    M js/indexes.js
    R js/jquery/jquery.sprintf.js
    M js/makegrid.js
    M js/messages.php
    M js/navigation.js
    M js/normalization.js
    M js/pmd/move.js
    M js/server_databases.js
    M js/server_privileges.js
    M js/server_status_monitor.js
    M js/server_user_groups.js
    M js/server_variables.js
    A js/sprintf.js
    M js/sql.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/Console.class.php
    M libraries/DisplayResults.class.php
    M libraries/Header.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Util.class.php
    M libraries/config.default.php
    M libraries/core.lib.php
    M libraries/db_designer.lib.php
    M libraries/dbi/DBIDummy.class.php
    M libraries/display_change_password.lib.php
    M libraries/display_create_database.lib.php
    M libraries/display_export.lib.php
    M libraries/display_import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/mysql_charsets.lib.php
    M libraries/operations.lib.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/export/ExportPdf.class.php
    M libraries/plugins/export/ExportXml.class.php
    M libraries/pmd_common.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_list.lib.php
    M libraries/rte/rte_routines.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/server_user_groups.lib.php
    M libraries/sqlparser.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_relation.lib.php
    R libraries/tbl_tracking.lib.php
    A libraries/tracking.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/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    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 scripts/advisor2po
    M scripts/create-release.sh
    M server_privileges.php
    M tbl_change.php
    M tbl_relation.php
    M tbl_tracking.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_mysql_charsets_test.php
    M test/libraries/PMA_server_privileges_test.php
    M test/libraries/PMA_tbl_columns_definition_form_test.php
    M test/libraries/PMA_tbl_tracking_test.php
    M test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
    A themes/original/img/bd_routine_add.png
    M themes/pmahomme/css/codemirror.css.php
    A themes/pmahomme/img/bd_routine_add.png
    M view_create.php

  Log Message:
  -----------
  Merge from master.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: bb1625007198598a77d71c1b6245d916207c3e4d
      https://github.com/phpmyadmin/phpmyadmin/commit/bb1625007198598a77d71c1b6245d916207c3e4d
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M libraries/Table.class.php

  Log Message:
  -----------
  Fix merge issue.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 389763e16ec712ba9d8820ea21c4b4519626a9f8
      https://github.com/phpmyadmin/phpmyadmin/commit/389763e16ec712ba9d8820ea21c4b4519626a9f8
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-08 (Wed, 08 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Test to parse SQL in a different way.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M ChangeLog

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


  Commit: 181c54f436c1adb77a5bd30e6a95ec22523b553d
      https://github.com/phpmyadmin/phpmyadmin/commit/181c54f436c1adb77a5bd30e6a95ec22523b553d
  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 82.0% (2433 of 2965 strings)

[CI skip]


  Commit: f09c4a3281977ec270eb46a64cb5ac7d8e599936
      https://github.com/phpmyadmin/phpmyadmin/commit/f09c4a3281977ec270eb46a64cb5ac7d8e599936
  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 98.4% (2919 of 2965 strings)

[CI skip]


  Commit: 72a631235c78e5af3483d3c4aca63ba1dbb6bb51
      https://github.com/phpmyadmin/phpmyadmin/commit/72a631235c78e5af3483d3c4aca63ba1dbb6bb51
  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% (2965 of 2965 strings)

[CI skip]


  Commit: bd9d791157121d0acc9b527836c7e8b47d14ae44
      https://github.com/phpmyadmin/phpmyadmin/commit/bd9d791157121d0acc9b527836c7e8b47d14ae44
  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/master'


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Add a ChangeLog entry for bug #3165

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


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

  Changed paths:
    M po/ca.po
    M po/de.po
    M po/tr.po

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


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

  Changed paths:
    M doc/config.rst
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M test/classes/PMA_Header_test.php
    M test/classes/PMA_Menu_test.php
    M test/classes/PMA_TableSearch_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/plugin/export/PMA_ExportXml_test.php
    M test/classes/plugin/import/ImportCsv_test.php
    M test/classes/plugin/import/ImportLdi_test.php
    M test/classes/plugin/import/ImportMediawiki_test.php
    M test/classes/plugin/import/ImportOds_test.php
    M test/classes/plugin/import/ImportShp_test.php
    M test/classes/plugin/import/ImportSql_test.php
    M test/classes/plugin/import/ImportXml_test.php
    M test/libraries/PMA_Tracker_test.php
    M test/libraries/PMA_mult_submits_test.php
    M test/libraries/common/PMA_showMessage_test_disabled.php

  Log Message:
  -----------
  Revert "The DisableIS directive is removed"

This reverts commit d8fd82a9f597f7a676ebdc2ad7f7f432b7c14550.

Conflicts:
	ChangeLog
	doc/config.rst
	libraries/config.default.php
	libraries/config/messages.inc.php

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


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

  Changed paths:
    M libraries/mysql_charsets.lib.php
    M test/classes/plugin/export/PMA_ExportSql_test.php
    M test/libraries/PMA_mysql_charsets_test.php

  Log Message:
  -----------
  Revert "The DisableIS directive is being deprecated"

This reverts commit 57ef25eed8b470cc521ad57d6ed5d79fc66e08e7.

Conflicts:
	test/classes/plugin/export/PMA_ExportSql_test.php

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


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

  Changed paths:
    M libraries/Table.class.php

  Log Message:
  -----------
  Revert "The DisableIS directive is being deprecated"

This reverts commit 2ac444acd4715afc86d0e99bd3bc20cd64861c9d.

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


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

  Changed paths:
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  Revert "The DisableIS directive is being deprecated"

This reverts commit e94f74fa51662a06ca2775255dd5039753d78844.

Conflicts:
	libraries/navigation/Nodes/Node_Database.class.php

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


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

  Changed paths:
    M libraries/navigation/Nodes/Node_Table.class.php

  Log Message:
  -----------
  Revert "The DisableIS directive is being deprecated"

This reverts commit 89d6473f49a6faf6d2e0b2fc09960f028bdb2c63.

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


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

  Changed paths:
    M libraries/navigation/Nodes/Node.class.php
    M test/classes/navigation/PMA_Node_test.php

  Log Message:
  -----------
  Revert "The DisableIS directive is being deprecated"

This reverts commit 8fd0d79405c0efb0d2dbe6fce45c1340fb92a4da.

Conflicts:
	libraries/navigation/Nodes/Node.class.php
	test/classes/navigation/PMA_Node_test.php

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


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

  Changed paths:
    M libraries/DatabaseInterface.class.php

  Log Message:
  -----------
  Revert "The DisableIS directive is being deprecated"

This reverts commit 4905240aedd8bb1375c10bae8aaff9df64092e71.

Conflicts:
	libraries/DatabaseInterface.class.php

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


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

  Changed paths:
    M libraries/DatabaseInterface.class.php

  Log Message:
  -----------
  Revert "The DisableIS directive is being deprecated"

This reverts commit 60938c67fadb044f6efadff7ecbebe22dc643e5c.

Conflicts:
	libraries/DatabaseInterface.class.php

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


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

  Changed paths:
    M libraries/DatabaseInterface.class.php
    M libraries/navigation/Nodes/Node.class.php

  Log Message:
  -----------
  Revert "The DisableIS directive is being deprecated"

This reverts commit 3065a3edcf88f8171fe060a8bc3e91db6573028d.

Conflicts:
	libraries/DatabaseInterface.class.php

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


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

  Changed paths:
    M libraries/DatabaseInterface.class.php

  Log Message:
  -----------
  Revert "The DisableIS directive is being deprecated"

This reverts commit b0962e8fd875fe067d38adaccdbdf6a21f7ffcbd.

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


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

  Changed paths:
    M libraries/DatabaseInterface.class.php

  Log Message:
  -----------
  Fix typo

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


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

  Changed paths:
    M libraries/navigation/Nodes/Node.class.php
    M libraries/navigation/Nodes/Node_Table.class.php

  Log Message:
  -----------
  User Server reference

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


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

  Changed paths:
    M test/classes/navigation/PMA_NavigationTree_test.php
    M test/classes/navigation/PMA_Node_test.php

  Log Message:
  -----------
  Fix failing tests

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


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

  Changed paths:
    M libraries/server_privileges.lib.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Refactor code duplication

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


  Commit: 712686013993abd7deec765542e84de9c80d31a2
      https://github.com/phpmyadmin/phpmyadmin/commit/712686013993abd7deec765542e84de9c80d31a2
  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.7% (2959 of 2965 strings)

[CI skip]


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

  Changed paths:
    M libraries/server_privileges.lib.php
    M test/libraries/PMA_server_privileges_test.php

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


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

  Changed paths:
    M test/classes/navigation/PMA_Node_test.php
    M test/libraries/PMA_structure_test.php

  Log Message:
  -----------
  Fix more failing tests

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


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

  Changed paths:
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  Take $singleItem parameter into consideration for non IS queries

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


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

  Changed paths:
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  Move duplicate code to a method

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


  Commit: dcaf3e1ab10dca8b52d945b5b17a10e5a568600d
      https://github.com/phpmyadmin/phpmyadmin/commit/dcaf3e1ab10dca8b52d945b5b17a10e5a568600d
  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:
  -----------
  Merge branch 'QA_4_2'

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


  Commit: a98f3bfbeff75da20ccddb727f0f7acd57837d1d
      https://github.com/phpmyadmin/phpmyadmin/commit/a98f3bfbeff75da20ccddb727f0f7acd57837d1d
  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 80.4% (2384 of 2965 strings)

[CI skip]


  Commit: 17bb5aed89ffcfad29e5835428947c6c77976ac9
      https://github.com/phpmyadmin/phpmyadmin/commit/17bb5aed89ffcfad29e5835428947c6c77976ac9
  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/master'


  Commit: 92ccb972e37a8bedd01c6b4248d6c537be9e410b
      https://github.com/phpmyadmin/phpmyadmin/commit/92ccb972e37a8bedd01c6b4248d6c537be9e410b
  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
    M libraries/server_privileges.lib.php
    M po/de.po
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Merge branch 'master' into DisableIS


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

  Changed paths:
    M libraries/Menu.class.php

  Log Message:
  -----------
  Status menu should be active for server_status_processes.php

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


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

  Changed paths:
    M po/ko.po

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


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

  Changed paths:
    M libraries/navigation/Nodes/Node.class.php

  Log Message:
  -----------
  Make SHOW DATABASES aware of only_db and hide_db

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


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

  Changed paths:
    M libraries/navigation/Nodes/Node.class.php

  Log Message:
  -----------
  Use upper case for SQL key words

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


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

  Changed paths:
    M libraries/navigation/Nodes/Node.class.php

  Log Message:
  -----------
  Adhere to NavigationTreeEnableGrouping

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


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

  Changed paths:
    M libraries/insert_edit.lib.php
    M tbl_change.php
    M test/libraries/PMA_insert_edit_test.php

  Log Message:
  -----------
  Refactor code duplication

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


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

  Changed paths:
    M libraries/insert_edit.lib.php

  Log Message:
  -----------
  Code cleanup

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


  Commit: 5cfefb8f8262c337f85de77a04b41446ff4feb25
      https://github.com/phpmyadmin/phpmyadmin/commit/5cfefb8f8262c337f85de77a04b41446ff4feb25
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Fix comment read.
Improve loops.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  4.2.11-dev

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


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

  Log Message:
  -----------
  Merge commit '4fb6012'


  Commit: 964b2a47ad1c261353231cdd57440d7d21edf080
      https://github.com/phpmyadmin/phpmyadmin/commit/964b2a47ad1c261353231cdd57440d7d21edf080
  Author: Xosé Calvo <xosecalvo at gmail.com>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Changed paths:
    M po/gl.po

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

Currently translated at 79.3% (2352 of 2965 strings)

[CI skip]


  Commit: 26c01500bc7dcddeae86fd3331cf2acff01b04ab
      https://github.com/phpmyadmin/phpmyadmin/commit/26c01500bc7dcddeae86fd3331cf2acff01b04ab
  Author: Anders Jonsson <anders.jonsson at norsjovallen.se>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Changed paths:
    M po/sv.po

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

Currently translated at 91.6% (2716 of 2965 strings)

[CI skip]


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

  Changed paths:
    M ChangeLog

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


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

  Log Message:
  -----------
  Merge commit 'f1d8620'


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

  Changed paths:
    M ChangeLog

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


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

  Changed paths:
    M libraries/navigation/Nodes/Node.class.php

  Log Message:
  -----------
  Show tables based getData implementation

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


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

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Refactor code duplication

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


  Commit: 759c2065b64a667a28d4e8a413760031f0a2c722
      https://github.com/phpmyadmin/phpmyadmin/commit/759c2065b64a667a28d4e8a413760031f0a2c722
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Fix code execution path warning and coding style

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


  Commit: 3fb80ff57f424ec18ed240a4ed2d9962f553282f
      https://github.com/phpmyadmin/phpmyadmin/commit/3fb80ff57f424ec18ed240a4ed2d9962f553282f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M libraries/tracking.lib.php
    M test/libraries/PMA_tbl_tracking_test.php

  Log Message:
  -----------
  Refactor code duplication

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


  Commit: 9f16a4ebbbc883345385d8a981637fda5b49b5eb
      https://github.com/phpmyadmin/phpmyadmin/commit/9f16a4ebbbc883345385d8a981637fda5b49b5eb
  Author: hassan mokhtari <persiste1 at gmail.com>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M po/ar.po

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

Currently translated at 37.5% (1113 of 2965 strings)

[CI skip]


  Commit: 84bb5b3616e08e86dd6265757e9e71964b8a0996
      https://github.com/phpmyadmin/phpmyadmin/commit/84bb5b3616e08e86dd6265757e9e71964b8a0996
  Author: Weblate <noreply at weblate.org>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M libraries/tracking.lib.php
    M test/libraries/PMA_tbl_tracking_test.php

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


  Commit: 3f9b63f572d079845927e24c667bbb0b423f4167
      https://github.com/phpmyadmin/phpmyadmin/commit/3f9b63f572d079845927e24c667bbb0b423f4167
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Improve SQL reading.
Remove trace.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 713a4ef90105021af4783751192b291a927a00d6
      https://github.com/phpmyadmin/phpmyadmin/commit/713a4ef90105021af4783751192b291a927a00d6
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Execute query.
Remove trace.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 2da2c4caf6025d61e8743629a0cda322d26e879f
      https://github.com/phpmyadmin/phpmyadmin/commit/2da2c4caf6025d61e8743629a0cda322d26e879f
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Reduce size of data to read.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 217644347a1471fc590f443a14b5a62506692028
      https://github.com/phpmyadmin/phpmyadmin/commit/217644347a1471fc590f443a14b5a62506692028
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M libraries/server_status_monitor.lib.php

  Log Message:
  -----------
  Fix merge issue.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 558e76ca559cc4a41d4fe7cc55f4225c55d7e3ac
      https://github.com/phpmyadmin/phpmyadmin/commit/558e76ca559cc4a41d4fe7cc55f4225c55d7e3ac
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-12 (Sun, 12 Oct 2014)

  Changed paths:
    M libraries/tracking.lib.php

  Log Message:
  -----------
  Fix code execution path warning

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


  Commit: 21f1716f81a0720ef76c5875c39e365bcfe2ebde
      https://github.com/phpmyadmin/phpmyadmin/commit/21f1716f81a0720ef76c5875c39e365bcfe2ebde
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Remove incorrect parameter

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


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

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Remove unused parameter

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


  Commit: 0ad35dd95632274d5b1c8e1e2617f508fa76bfb8
      https://github.com/phpmyadmin/phpmyadmin/commit/0ad35dd95632274d5b1c8e1e2617f508fa76bfb8
  Author: josep constanti <jconstanti at ovi.com>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Changed paths:
    M po/ca.po

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

Currently translated at 82.6% (2452 of 2965 strings)

[CI skip]


  Commit: 188c6fcc87e5adb46e66255f0a5d1548185df3be
      https://github.com/phpmyadmin/phpmyadmin/commit/188c6fcc87e5adb46e66255f0a5d1548185df3be
  Author: Weblate <noreply at weblate.org>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Changed paths:
    M libraries/sql.lib.php

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


  Commit: 4f6b4bb412f23e5f1bc2a956bb6fcea0692002ec
      https://github.com/phpmyadmin/phpmyadmin/commit/4f6b4bb412f23e5f1bc2a956bb6fcea0692002ec
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Remove doc for unused parameter

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


  Commit: 4395279216ee8bcfddd23f0e20017942107b6c07
      https://github.com/phpmyadmin/phpmyadmin/commit/4395279216ee8bcfddd23f0e20017942107b6c07
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Log Message:
  -----------
  Merge commit '33a3979'


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

  Changed paths:
    M ChangeLog

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


  Commit: 21b5fd8bb7ac699f8ec2b52a10a7869964671328
      https://github.com/phpmyadmin/phpmyadmin/commit/21b5fd8bb7ac699f8ec2b52a10a7869964671328
  Author: Matías Bellone <matiasbellone+weblate at gmail.com>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M po/es.po

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

Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]


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

  Changed paths:
    M libraries/navigation/Nodes/Node.class.php

  Log Message:
  -----------
  Use caps for SQL keywords

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


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

  Changed paths:
    M libraries/dbi/DBIDummy.class.php
    M test/classes/navigation/PMA_Node_test.php

  Log Message:
  -----------
  Fix failing tests

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


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

  Changed paths:
    M test/classes/navigation/PMA_Node_test.php

  Log Message:
  -----------
  Additional unit tests for new execution paths

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


  Commit: 32c1192351e3d0af1fd53c20e57aaba071902789
      https://github.com/phpmyadmin/phpmyadmin/commit/32c1192351e3d0af1fd53c20e57aaba071902789
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    M libraries/server_privileges.lib.php
    M libraries/structure.lib.php
    M tbl_operations.php

  Log Message:
  -----------
  Fix code execution path warning

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


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

  Changed paths:
    M po/de.po

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

Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]


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

  Changed paths:
    M libraries/server_privileges.lib.php
    M libraries/structure.lib.php
    M tbl_operations.php

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


  Commit: 6cc3ea6eae4a0cef0987cb40dfe8b2fc20ffe20a
      https://github.com/phpmyadmin/phpmyadmin/commit/6cc3ea6eae4a0cef0987cb40dfe8b2fc20ffe20a
  Author: Nisarg Jhaveri <nisarg.jhaveri at research.iiit.ac.in>
  Date:   2014-10-14 (Tue, 14 Oct 2014)

  Changed paths:
    A db_sql_autocomplete.php
    M js/codemirror/addon/hint/sql-hint.js
    M js/functions.js

  Log Message:
  -----------
  Autocomplete table/column names in SQL editors

- In DB and Table level SQL editors, console
- Updated CodeMirror addon `sql-hint.js` to newer version

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri at research.iiit.ac.in>


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

  Changed paths:
    M libraries/DatabaseInterface.class.php

  Log Message:
  -----------
  Fix privilege checking queries

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


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

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

  Log Message:
  -----------
  Fix failing tests

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


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

  Changed paths:
    M libraries/DatabaseInterface.class.php
    M test/classes/navigation/PMA_NavigationTree_test.php
    M test/libraries/PMA_server_collations_test.php

  Log Message:
  -----------
  SHOW GRANTS based privilege checking

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


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

  Changed paths:
    M libraries/DatabaseInterface.class.php

  Log Message:
  -----------
  Remove outdated comment

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


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

  Changed paths:
    A db_sql_autocomplete.php
    M js/codemirror/addon/hint/sql-hint.js
    M js/functions.js

  Log Message:
  -----------
  Merge pull request #1377 from nisargjhaveri/autocomplete

Autocomplete table/column names in SQL editors


  Commit: 28d9f67141bb0e6900d5dfc996c74ccd30d63aeb
      https://github.com/phpmyadmin/phpmyadmin/commit/28d9f67141bb0e6900d5dfc996c74ccd30d63aeb
  Author: josep constanti <jconstanti at ovi.com>
  Date:   2014-10-15 (Wed, 15 Oct 2014)

  Changed paths:
    M po/ca.po

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

Currently translated at 82.9% (2459 of 2965 strings)

[CI skip]


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

  Changed paths:
    A db_sql_autocomplete.php
    M js/codemirror/addon/hint/sql-hint.js
    M js/functions.js

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


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

  Changed paths:
    M libraries/DatabaseInterface.class.php
    M libraries/Table.class.php
    M libraries/structure.lib.php

  Log Message:
  -----------
  Additional fix for bug #3869. Consider tables in information_schema as views to benefit from 'MaxExactCountViews' and avoid count(*) in information_schema tables

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


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

  Changed paths:
    M libraries/DatabaseInterface.class.php

  Log Message:
  -----------
  Initialize the array

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


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

  Changed paths:
    M doc/config.rst
    M libraries/DatabaseInterface.class.php
    M libraries/Table.class.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/dbi/DBIDummy.class.php
    M libraries/mysql_charsets.lib.php
    M libraries/navigation/Nodes/Node.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/structure.lib.php
    M test/classes/PMA_Header_test.php
    M test/classes/PMA_Menu_test.php
    M test/classes/PMA_TableSearch_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/navigation/PMA_NavigationTree_test.php
    M test/classes/navigation/PMA_Node_test.php
    M test/classes/plugin/export/PMA_ExportSql_test.php
    M test/classes/plugin/export/PMA_ExportXml_test.php
    M test/classes/plugin/import/ImportCsv_test.php
    M test/classes/plugin/import/ImportLdi_test.php
    M test/classes/plugin/import/ImportMediawiki_test.php
    M test/classes/plugin/import/ImportOds_test.php
    M test/classes/plugin/import/ImportShp_test.php
    M test/classes/plugin/import/ImportSql_test.php
    M test/classes/plugin/import/ImportXml_test.php
    M test/libraries/PMA_Tracker_test.php
    M test/libraries/PMA_mult_submits_test.php
    M test/libraries/PMA_mysql_charsets_test.php
    M test/libraries/PMA_server_collations_test.php
    M test/libraries/PMA_structure_test.php
    M test/libraries/common/PMA_showMessage_test_disabled.php

  Log Message:
  -----------
  Merge pull request #1375 from madhuracj/DisableIS

Performance improvements related to IS


  Commit: c7179ef4f4ed7275111f10f7ae9daf15485719e3
      https://github.com/phpmyadmin/phpmyadmin/commit/c7179ef4f4ed7275111f10f7ae9daf15485719e3
  Author: Boyan Kehayov <bkehayov at gmail.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M po/bg.po

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

Currently translated at 62.7% (1860 of 2965 strings)

[CI skip]


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

  Changed paths:
    M po/ca.po

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

Currently translated at 82.9% (2460 of 2965 strings)

[CI skip]


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

  Changed paths:
    M doc/config.rst
    M libraries/DatabaseInterface.class.php
    M libraries/Table.class.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/dbi/DBIDummy.class.php
    M libraries/mysql_charsets.lib.php
    M libraries/navigation/Nodes/Node.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/structure.lib.php
    M test/classes/PMA_Header_test.php
    M test/classes/PMA_Menu_test.php
    M test/classes/PMA_TableSearch_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/navigation/PMA_NavigationTree_test.php
    M test/classes/navigation/PMA_Node_test.php
    M test/classes/plugin/export/PMA_ExportSql_test.php
    M test/classes/plugin/export/PMA_ExportXml_test.php
    M test/classes/plugin/import/ImportCsv_test.php
    M test/classes/plugin/import/ImportLdi_test.php
    M test/classes/plugin/import/ImportMediawiki_test.php
    M test/classes/plugin/import/ImportOds_test.php
    M test/classes/plugin/import/ImportShp_test.php
    M test/classes/plugin/import/ImportSql_test.php
    M test/classes/plugin/import/ImportXml_test.php
    M test/libraries/PMA_Tracker_test.php
    M test/libraries/PMA_mult_submits_test.php
    M test/libraries/PMA_mysql_charsets_test.php
    M test/libraries/PMA_server_collations_test.php
    M test/libraries/PMA_structure_test.php
    M test/libraries/common/PMA_showMessage_test_disabled.php

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


  Commit: 310b76c585f4c92a43f199b1f4d94e616b8229af
      https://github.com/phpmyadmin/phpmyadmin/commit/310b76c585f4c92a43f199b1f4d94e616b8229af
  Author: Nisarg Jhaveri <nisarg.jhaveri at research.iiit.ac.in>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M js/functions.js
    M js/messages.php
    M libraries/tbl_columns_definition_form.lib.php
    M test/libraries/PMA_tbl_columns_definition_form_test.php

  Log Message:
  -----------
  bug #4558 Unable to Add Rows while Creating Table

- Remove inline JS from add column button.
- Remove unnecessary eventhandler to submit form on enter.
- Added event handler to add column field to add on enter.
- Fix tests

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri at research.iiit.ac.in>


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

  Changed paths:
    M js/functions.js
    M js/messages.php
    M libraries/tbl_columns_definition_form.lib.php
    M test/libraries/PMA_tbl_columns_definition_form_test.php

  Log Message:
  -----------
  Merge pull request #1378 from nisargjhaveri/bug_4558

bug #4558 Unable to Add Rows while Creating Table


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

  Changed paths:
    M ChangeLog

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

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


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

  Changed paths:
    M libraries/db_info.inc.php
    M libraries/navigation/Nodes/Node.class.php

  Log Message:
  -----------
  Fix typo

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


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

  Changed paths:
    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/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    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:
  -----------
  Update po files


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

  Changed paths:
    M po/tr.po

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

Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]


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

  Changed paths:
    M libraries/DatabaseInterface.class.php
    M libraries/Index.class.php
    M libraries/Menu.class.php
    M libraries/Partition.class.php
    M libraries/Types.class.php
    M libraries/Util.class.php
    M libraries/common.inc.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportXml.class.php
    M libraries/server_privileges.lib.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_indexes.lib.php
    M server_status_monitor.php
    M test/classes/plugin/export/PMA_ExportSql_test.php

  Log Message:
  -----------
  The minimum supported MySQL version is 5.5

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


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

  Changed paths:
    M po/tr.po

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: 5157d1cf2661e4090d47db26e58c6dd6653d8ca5
      https://github.com/phpmyadmin/phpmyadmin/commit/5157d1cf2661e4090d47db26e58c6dd6653d8ca5
  Author: Panagiotis Papazoglou <papaz_p at yahoo.com>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M po/el.po

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

Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]


  Commit: cccd56a735d4362ffc0358da8bba422800acd3c9
      https://github.com/phpmyadmin/phpmyadmin/commit/cccd56a735d4362ffc0358da8bba422800acd3c9
  Author: Edgars Neimanis <edgarsneims5092 at inbox.lv>
  Date:   2014-10-16 (Thu, 16 Oct 2014)

  Changed paths:
    M po/lv.po

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

Currently translated at 21.6% (645 of 2973 strings)

[CI skip]


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

  Changed paths:
    M db_structure.php

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


  Commit: 998f969d5eb7ce0f58f4161d5f69e4378cf44ef1
      https://github.com/phpmyadmin/phpmyadmin/commit/998f969d5eb7ce0f58f4161d5f69e4378cf44ef1
  Author: Wojciech Mleczek <git at wojtekmleczek.pl>
  Date:   2014-10-17 (Fri, 17 Oct 2014)

  Changed paths:
    M db_structure.php

  Log Message:
  -----------
  rfe1547 - Wrap message with message box

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


  Commit: ad67a3a8318cbce2a6e110e87b9b14be0594cb1a
      https://github.com/phpmyadmin/phpmyadmin/commit/ad67a3a8318cbce2a6e110e87b9b14be0594cb1a
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-10-17 (Fri, 17 Oct 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Change log entry

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


  Commit: 0afe20e942e8b55bf6b1602fbd17e3c1eb0c8b17
      https://github.com/phpmyadmin/phpmyadmin/commit/0afe20e942e8b55bf6b1602fbd17e3c1eb0c8b17
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-10-17 (Fri, 17 Oct 2014)

  Changed paths:
    M po/lv.po

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


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

  Changed paths:
    M ChangeLog
    M libraries/DatabaseInterface.class.php
    M libraries/Util.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_routines.lib.php

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

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


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

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Bug #4561 PHP error in transformations

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


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

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Wrap some long lines

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


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

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Wrap more long lines

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


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

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

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


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

  Changed paths:
    M libraries/common.inc.php
    M libraries/core.lib.php

  Log Message:
  -----------
  bug #4560 PHP error on master branch

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


  Commit: 292197a89a54176c96882ff7a52f72f44c909c26
      https://github.com/phpmyadmin/phpmyadmin/commit/292197a89a54176c96882ff7a52f72f44c909c26
  Author: Giovanni Sora <g.sora at tiscali.it>
  Date:   2014-10-17 (Fri, 17 Oct 2014)

  Changed paths:
    M po/ia.po

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

Currently translated at 61.4% (1826 of 2973 strings)

[CI skip]


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

  Changed paths:
    M libraries/common.inc.php
    M libraries/core.lib.php

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


  Commit: 001ebb8d03da41ddfd6256885ef6652797bd82a1
      https://github.com/phpmyadmin/phpmyadmin/commit/001ebb8d03da41ddfd6256885ef6652797bd82a1
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2014-10-17 (Fri, 17 Oct 2014)

  Changed paths:
    M po/et.po

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

Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]


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

  Changed paths:
    M libraries/rte/rte_routines.lib.php

  Log Message:
  -----------
  Wrap a long line

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


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

  Changed paths:
    M libraries/common.inc.php

  Log Message:
  -----------
  Align

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


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

  Changed paths:
    M po/fr.po

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

Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]


  Commit: b4d97de6787049e76f14c3b8094ba42f3fce7185
      https://github.com/phpmyadmin/phpmyadmin/commit/b4d97de6787049e76f14c3b8094ba42f3fce7185
  Author: Giovanni Sora <g.sora at tiscali.it>
  Date:   2014-10-17 (Fri, 17 Oct 2014)

  Changed paths:
    M po/ia.po

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

Currently translated at 62.5% (1861 of 2973 strings)

[CI skip]


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

  Log Message:
  -----------
  Merge commit 'e7f1c85'


  Commit: dc23f789fa3cf78d42d4ea3207e7f08b4343dc5b
      https://github.com/phpmyadmin/phpmyadmin/commit/dc23f789fa3cf78d42d4ea3207e7f08b4343dc5b
  Author: Giovanni Sora <g.sora at tiscali.it>
  Date:   2014-10-17 (Fri, 17 Oct 2014)

  Changed paths:
    M po/ia.po

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

Currently translated at 62.9% (1872 of 2973 strings)

[CI skip]


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

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


  Commit: 38aac207a8f055661040f8be74381e82eb95932b
      https://github.com/phpmyadmin/phpmyadmin/commit/38aac207a8f055661040f8be74381e82eb95932b
  Author: Domen <mitenem at outlook.com>
  Date:   2014-10-17 (Fri, 17 Oct 2014)

  Changed paths:
    M po/sl.po

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

Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]


  Commit: 2886766381d9ba87470bb482f2c45d5f08b05f91
      https://github.com/phpmyadmin/phpmyadmin/commit/2886766381d9ba87470bb482f2c45d5f08b05f91
  Author: julianladisch <github.com-t3if at ladisch.de>
  Date:   2014-10-17 (Fri, 17 Oct 2014)

  Changed paths:
    M po/de.po

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

Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]


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

  Changed paths:
    M po/de.po
    M po/et.po
    M po/fr.po
    M po/ia.po
    M po/sl.po

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


  Commit: 69950373d5e4b2873aa01ab08b5d7c0bd267eb6a
      https://github.com/phpmyadmin/phpmyadmin/commit/69950373d5e4b2873aa01ab08b5d7c0bd267eb6a
  Author: Tor Stokkan <danorse at gmail.com>
  Date:   2014-10-18 (Sat, 18 Oct 2014)

  Changed paths:
    M po/nb.po

  Log Message:
  -----------
  Translated using Weblate (Norwegian Bokmål)

Currently translated at 59.8% (1780 of 2973 strings)

[CI skip]


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

  Changed paths:
    M libraries/plugins/export/ExportHtmlword.class.php

  Log Message:
  -----------
  Remove unused code

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


  Commit: 45c2189a34a7d6648f7038b3230d3ce822369227
      https://github.com/phpmyadmin/phpmyadmin/commit/45c2189a34a7d6648f7038b3230d3ce822369227
  Author: Giovanni Sora <g.sora at tiscali.it>
  Date:   2014-10-18 (Sat, 18 Oct 2014)

  Changed paths:
    M po/ia.po

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

Currently translated at 63.7% (1895 of 2973 strings)

[CI skip]


  Commit: 346db836b20fa31ec9b074913ec5ebb26f575754
      https://github.com/phpmyadmin/phpmyadmin/commit/346db836b20fa31ec9b074913ec5ebb26f575754
  Author: Tor Stokkan <danorse at gmail.com>
  Date:   2014-10-18 (Sat, 18 Oct 2014)

  Changed paths:
    M po/nb.po

  Log Message:
  -----------
  Translated using Weblate (Norwegian Bokmål)

Currently translated at 59.9% (1782 of 2973 strings)

[CI skip]


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

  Changed paths:
    M libraries/plugins/export/ExportHtmlword.class.php

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


  Commit: d898d66229ba70752e9b8c9093c37d72e8f7fb05
      https://github.com/phpmyadmin/phpmyadmin/commit/d898d66229ba70752e9b8c9093c37d72e8f7fb05
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2014-10-18 (Sat, 18 Oct 2014)

  Changed paths:
    M po/nl.po

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

Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]


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

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Include by default

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


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

  Changed paths:
    M libraries/plugins/export/ExportHtmlword.class.php
    M po/ia.po
    M po/nb.po
    M po/nl.po

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


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

  Changed paths:
    M test/bootstrap-dist.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  Fix some of the failing tests

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


  Commit: b1a7039ae322c3c20254273792fc31b69fdfa073
      https://github.com/phpmyadmin/phpmyadmin/commit/b1a7039ae322c3c20254273792fc31b69fdfa073
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-10-18 (Sat, 18 Oct 2014)

  Changed paths:
    M db_create.php
    M db_datadict.php
    M db_printview.php
    M db_structure.php
    M export.php
    M import.php
    M index.php
    M libraries/Advisor.class.php
    M libraries/DbSearch.class.php
    M libraries/Header.class.php
    M libraries/Menu.class.php
    M libraries/ServerStatusData.class.php
    M libraries/TableSearch.class.php
    M libraries/db_common.inc.php
    M libraries/db_table_exists.lib.php
    M libraries/display_import.lib.php
    M libraries/export.lib.php
    M libraries/navigation/Navigation.class.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_DatabaseChild.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/schema/Export_Relation_Schema.class.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_main.inc.php
    M libraries/server_common.inc.php
    M libraries/server_databases.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_variables.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_common.inc.php
    M libraries/tracking.lib.php
    M prefs_forms.php
    M sql.php
    M tbl_addfield.php
    M tbl_create.php
    M tbl_printview.php
    M tbl_select.php
    M tbl_zoom_select.php
    M test/classes/navigation/PMA_Navigation_test.php
    M test/classes/navigation/PMA_Node_DatabaseChild_test.php
    M test/libraries/PMA_generateCommonUrl_test.php

  Log Message:
  -----------
  Convert PMA_URL_getCommon calls to new style

Rewritten tests need validation
Signed-Off-By: Ann + J.M. <phpMyAdmin at ZweiSteinSoft.de>


  Commit: 9a4c9f13fd1534f4d0f637b3aea621afd332db60
      https://github.com/phpmyadmin/phpmyadmin/commit/9a4c9f13fd1534f4d0f637b3aea621afd332db60
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-10-18 (Sat, 18 Oct 2014)

  Changed paths:
    M libraries/url_generating.lib.php

  Log Message:
  -----------
  Remove old style from PMA_URL_getCommon definition

Signed-Off-By: Ann + J.M. <phpMyAdmin at ZweiSteinSoft.de>


  Commit: e0af0a6e1bd96c62b6a17f39f7287c3512569426
      https://github.com/phpmyadmin/phpmyadmin/commit/e0af0a6e1bd96c62b6a17f39f7287c3512569426
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-10-18 (Sat, 18 Oct 2014)

  Changed paths:
    M libraries/url_generating.lib.php

  Log Message:
  -----------
  PMA_URL_getCommon: Make $params array optional

Signed-Off-By: Ann + J.M. <phpMyAdmin at ZweiSteinSoft.de>


  Commit: a540e6ba878bae1fc352fadb8aad278a69f17365
      https://github.com/phpmyadmin/phpmyadmin/commit/a540e6ba878bae1fc352fadb8aad278a69f17365
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-10-18 (Sat, 18 Oct 2014)

  Changed paths:
    M db_operations.php
    M db_structure.php
    M db_tracking.php
    M js/server_status_monitor.js
    M js/server_status_processes.js
    M libraries/Header.class.php
    M libraries/Menu.class.php
    M libraries/build_html_for_db.lib.php
    M libraries/db_common.inc.php
    M libraries/db_table_exists.lib.php
    M libraries/display_import.lib.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/relation.lib.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_list.lib.php
    M libraries/server_databases.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_common.inc.php
    M libraries/tracking.lib.php
    M prefs_forms.php

  Log Message:
  -----------
  More fixes to new PMA_URL_getCommon style

Signed-off-by: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>


  Commit: d936df12d26a6f743311e1f598ca755291e61f38
      https://github.com/phpmyadmin/phpmyadmin/commit/d936df12d26a6f743311e1f598ca755291e61f38
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-18 (Sat, 18 Oct 2014)

  Changed paths:
    M libraries/config.default.php
    M libraries/config/user_preferences.forms.php
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Manage option to read SQL as a multibytes string or not.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 4b9058faa9903feabb94430d4be3ca0ea3454141
      https://github.com/phpmyadmin/phpmyadmin/commit/4b9058faa9903feabb94430d4be3ca0ea3454141
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-18 (Sat, 18 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Manage escaped quotes.
Improve process not to look for the same thing many times.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M test/classes/plugin/export/PMA_ExportHtmlword_test.php

  Log Message:
  -----------
  Adjust tests for commit 3ec96cb038853f0f6d8198461b20c4a784cc9bf0

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


  Commit: b21314179b265e490cbf02c506cdf86b07167b29
      https://github.com/phpmyadmin/phpmyadmin/commit/b21314179b265e490cbf02c506cdf86b07167b29
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

  Changed paths:
    M libraries/tbl_columns_definition_form.lib.php

  Log Message:
  -----------
  phpdoc variable type fix

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: 9680410019dcfdd49c536d1b4608a85671ce2dfa
      https://github.com/phpmyadmin/phpmyadmin/commit/9680410019dcfdd49c536d1b4608a85671ce2dfa
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-19 (Sun, 19 Oct 2014)

  Changed paths:
    M db_datadict.php
    M libraries/plugins/export/ExportHtmlword.class.php
    M libraries/plugins/export/ExportLatex.class.php
    M libraries/plugins/export/ExportOdt.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportTexytext.class.php
    M libraries/relation.lib.php

  Log Message:
  -----------
  Refactor code duplication

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


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

  Changed paths:
    M libraries/Header.class.php
    M libraries/RecentFavoriteTable.class.php
    A tbl_recent_favorite.php

  Log Message:
  -----------
  Do not check for the validity of all recent tables on initial loading.

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


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

  Changed paths:
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node.class.php
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  Count hidden tables aggregatively rather than for individual database

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


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

  Changed paths:
    M js/navigation.js

  Log Message:
  -----------
  Do not remove throbber in case of aborted ajax filter calls

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


  Commit: 03b84715f66eba027c6bdbcb0456b986ab013314
      https://github.com/phpmyadmin/phpmyadmin/commit/03b84715f66eba027c6bdbcb0456b986ab013314
  Author: josep constanti <jconstanti at ovi.com>
  Date:   2014-10-20 (Mon, 20 Oct 2014)

  Changed paths:
    M po/ca.po

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

Currently translated at 83.5% (2484 of 2973 strings)

[CI skip]


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

  Changed paths:
    M js/navigation.js

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


  Commit: 8a3bf5af9f3333ac7bd526a1d945c0ebf47c3815
      https://github.com/phpmyadmin/phpmyadmin/commit/8a3bf5af9f3333ac7bd526a1d945c0ebf47c3815
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-20 (Mon, 20 Oct 2014)

  Changed paths:
    M import.php
    M libraries/core.lib.php
    M server_privileges.php

  Log Message:
  -----------
  Refactor code duplication

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


  Commit: a4546feda10327d6a79e644026adba38d1569bbf
      https://github.com/phpmyadmin/phpmyadmin/commit/a4546feda10327d6a79e644026adba38d1569bbf
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-20 (Mon, 20 Oct 2014)

  Changed paths:
    M libraries/Config.class.php

  Log Message:
  -----------
  Fix #4559: don't use multibytes to read hash.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 74f0beda8f30bf05b2a4cbe915f519f27e92b259
      https://github.com/phpmyadmin/phpmyadmin/commit/74f0beda8f30bf05b2a4cbe915f519f27e92b259
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-20 (Mon, 20 Oct 2014)

  Changed paths:
    M ChangeLog
    M db_datadict.php
    A db_sql_autocomplete.php
    M db_structure.php
    M doc/config.rst
    M import.php
    M js/codemirror/addon/hint/sql-hint.js
    M js/functions.js
    M js/messages.php
    M js/navigation.js
    M libraries/DatabaseInterface.class.php
    M libraries/DisplayResults.class.php
    M libraries/Index.class.php
    M libraries/Menu.class.php
    M libraries/Partition.class.php
    M libraries/Table.class.php
    M libraries/Types.class.php
    M libraries/Util.class.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/core.lib.php
    M libraries/db_info.inc.php
    M libraries/dbi/DBIDummy.class.php
    M libraries/insert_edit.lib.php
    M libraries/mysql_charsets.lib.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/export/ExportHtmlword.class.php
    M libraries/plugins/export/ExportLatex.class.php
    M libraries/plugins/export/ExportOdt.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportTexytext.class.php
    M libraries/plugins/export/ExportXml.class.php
    M libraries/relation.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_routines.lib.php
    M libraries/server_privileges.lib.php
    M libraries/sql.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_indexes.lib.php
    M libraries/tracking.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/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    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 server_privileges.php
    M server_status_monitor.php
    M tbl_change.php
    M tbl_operations.php
    M test/bootstrap-dist.php
    M test/classes/PMA_Header_test.php
    M test/classes/PMA_Menu_test.php
    M test/classes/PMA_TableSearch_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/navigation/PMA_NavigationTree_test.php
    M test/classes/navigation/PMA_Node_test.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    M test/classes/plugin/export/PMA_ExportHtmlword_test.php
    M test/classes/plugin/export/PMA_ExportSql_test.php
    M test/classes/plugin/export/PMA_ExportXml_test.php
    M test/classes/plugin/import/ImportCsv_test.php
    M test/classes/plugin/import/ImportLdi_test.php
    M test/classes/plugin/import/ImportMediawiki_test.php
    M test/classes/plugin/import/ImportOds_test.php
    M test/classes/plugin/import/ImportShp_test.php
    M test/classes/plugin/import/ImportSql_test.php
    M test/classes/plugin/import/ImportXml_test.php
    M test/libraries/PMA_Tracker_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_mult_submits_test.php
    M test/libraries/PMA_mysql_charsets_test.php
    M test/libraries/PMA_server_collations_test.php
    M test/libraries/PMA_server_privileges_test.php
    M test/libraries/PMA_structure_test.php
    M test/libraries/PMA_tbl_columns_definition_form_test.php
    M test/libraries/PMA_tbl_tracking_test.php
    M test/libraries/common/PMA_showMessage_test_disabled.php

  Log Message:
  -----------
  Fix syntax error.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 3363f1088091ea01e5c1917a6900a63e677b2663
      https://github.com/phpmyadmin/phpmyadmin/commit/3363f1088091ea01e5c1917a6900a63e677b2663
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-20 (Mon, 20 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Rename ImportSQL method.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 270d2a0ceefedc348cedb598ffda6e6c536d7169
      https://github.com/phpmyadmin/phpmyadmin/commit/270d2a0ceefedc348cedb598ffda6e6c536d7169
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-20 (Mon, 20 Oct 2014)

  Changed paths:
    M libraries/Config.class.php

  Log Message:
  -----------
  Merge pull request #1382 from Tithugues/b4559_master

Fix #4559: don't use multibytes to read hash.


  Commit: f5c271667b61b51de2258cde11cbe30ab484ebdd
      https://github.com/phpmyadmin/phpmyadmin/commit/f5c271667b61b51de2258cde11cbe30ab484ebdd
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-20 (Mon, 20 Oct 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update ChangeLog.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 20d7e0c71ea88ef6c4cdd966005b8f3062f2bc26
      https://github.com/phpmyadmin/phpmyadmin/commit/20d7e0c71ea88ef6c4cdd966005b8f3062f2bc26
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-20 (Mon, 20 Oct 2014)

  Changed paths:
    M libraries/Config.class.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


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

  Changed paths:
    M libraries/relation.lib.php

  Log Message:
  -----------
  Disable finding child referenced when DisableIS is false.

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


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

  Changed paths:
    M libraries/relation.lib.php
    M libraries/tbl_columns_definition_form.inc.php

  Log Message:
  -----------
  Get foreigners just once for table and use it for all columns

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


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

  Changed paths:
    M libraries/relation.lib.php
    M libraries/tbl_columns_definition_form.inc.php

  Log Message:
  -----------
  Get child references for the whole table at once.

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


  Commit: d87a99e01c1856775b8b585618aa69b679e9c69f
      https://github.com/phpmyadmin/phpmyadmin/commit/d87a99e01c1856775b8b585618aa69b679e9c69f
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M js/pmd/history.js
    M js/pmd/move.js
    M libraries/db_designer.lib.php
    M themes/pmahomme/css/pmd.css.php

  Log Message:
  -----------
  moving inline js out from db_designer.lib.php plus minor bug fixes

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


  Commit: 83e322352401cbe18c6674dd489a1a3704466820
      https://github.com/phpmyadmin/phpmyadmin/commit/83e322352401cbe18c6674dd489a1a3704466820
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Log Message:
  -----------
  Merge commit '8186a0e'


  Commit: 1ca706fd1ec74f88aa61ed4345c9be0617ca3486
      https://github.com/phpmyadmin/phpmyadmin/commit/1ca706fd1ec74f88aa61ed4345c9be0617ca3486
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Log Message:
  -----------
  Merge commit '319aac3'


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

  Changed paths:
    M po/cs.po

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

Currently translated at 93.7% (2787 of 2973 strings)

[CI skip]


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

  Changed paths:
    M ChangeLog
    M js/server_status_monitor.js
    M libraries/DatabaseInterface.class.php

  Log Message:
  -----------
  Fix merge conflicts

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


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

  Log Message:
  -----------
  Merge commit 'd8d4a80'


  Commit: 387f6aa273541d04fdbc69a0bacd5df442d1bfd4
      https://github.com/phpmyadmin/phpmyadmin/commit/387f6aa273541d04fdbc69a0bacd5df442d1bfd4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M po/cs.po

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


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

  Changed paths:
    M libraries/relation.lib.php

  Log Message:
  -----------
  Avoid accessing undefined indexes

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


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

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

  Log Message:
  -----------
  bug #4564 Designer: spaces in table name with edit table link generates bad links

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


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

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

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

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


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

  Changed paths:
    M ChangeLog
    M js/tbl_chart.js

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


  Commit: 41eda0819afba3589bf3e4be4c6626525b4d27d3
      https://github.com/phpmyadmin/phpmyadmin/commit/41eda0819afba3589bf3e4be4c6626525b4d27d3
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M ChangeLog
    M import.php
    M js/navigation.js
    M js/server_status_monitor.js
    M js/tbl_chart.js
    M libraries/Config.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/core.lib.php
    M libraries/relation.lib.php
    M po/ca.po
    M po/cs.po
    M server_privileges.php

  Log Message:
  -----------
  resolve conflict

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


  Commit: b4906839e4754ca0648541261644acfcdb585885
      https://github.com/phpmyadmin/phpmyadmin/commit/b4906839e4754ca0648541261644acfcdb585885
  Author: Smita Kumari <kumarismita62 at gmail.com>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M libraries/core.lib.php

  Log Message:
  -----------
  remove trailing white spaces

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


  Commit: 29ec69c849e1db90724a3c3ed62356ea5fe96a59
      https://github.com/phpmyadmin/phpmyadmin/commit/29ec69c849e1db90724a3c3ed62356ea5fe96a59
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

  Changed paths:
    M ChangeLog
    M db_datadict.php
    M import.php
    M js/navigation.js
    M js/server_status_monitor.js
    M js/tbl_chart.js
    M libraries/Config.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/core.lib.php
    M libraries/db_designer.lib.php
    M libraries/plugins/export/ExportHtmlword.class.php
    M libraries/plugins/export/ExportLatex.class.php
    M libraries/plugins/export/ExportOdt.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportTexytext.class.php
    M libraries/relation.lib.php
    M libraries/tbl_columns_definition_form.lib.php
    M po/ca.po
    M po/cs.po
    M server_privileges.php
    M test/classes/plugin/export/PMA_ExportHtmlword_test.php

  Log Message:
  -----------
  Merge branch 'master' into ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style

Signed-off-by: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>


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

  Changed paths:
    M libraries/common.inc.php
    M libraries/core.lib.php

  Log Message:
  -----------
  Refactor code duplication

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


  Commit: b5d04d24c125266ce91acab23d5a7a0641e7a0a4
      https://github.com/phpmyadmin/phpmyadmin/commit/b5d04d24c125266ce91acab23d5a7a0641e7a0a4
  Author: Eyal Visoker <visokereyal at gmail.com>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

  Changed paths:
    M po/he.po

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

Currently translated at 19.6% (584 of 2973 strings)

[CI skip]


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

  Changed paths:
    M libraries/common.inc.php
    M libraries/core.lib.php

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


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

  Changed paths:
    M js/pmd/history.js
    M js/pmd/move.js
    M libraries/db_designer.lib.php

  Log Message:
  -----------
  fixing coding style

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


  Commit: b1b6232c0453a75b1951085333fcee47c12c2527
      https://github.com/phpmyadmin/phpmyadmin/commit/b1b6232c0453a75b1951085333fcee47c12c2527
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Remove dead codes

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


  Commit: 6feb3b0d3a8b68ea2e7fda7eebd9cdb6c7e71f64
      https://github.com/phpmyadmin/phpmyadmin/commit/6feb3b0d3a8b68ea2e7fda7eebd9cdb6c7e71f64
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

  Changed paths:
    M js/db_search.js
    M libraries/Footer.class.php
    M tbl_select.php
    M test/classes/PMA_DbSearch_test.php

  Log Message:
  -----------
  Fix failing unit tests

Signed-off-by: Ann + J.M. <phpMyAdmin at ZweiSteinSoft.de>


  Commit: 953e865fc626344b78cbfebd6c77e05139354877
      https://github.com/phpmyadmin/phpmyadmin/commit/953e865fc626344b78cbfebd6c77e05139354877
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

  Changed paths:
    M js/pmd/designer_db.js
    M js/pmd/designer_page.js
    M js/pmd/move.js
    M libraries/DatabaseInterface.class.php
    M test/classes/navigation/PMA_Node_test.php

  Log Message:
  -----------
  Fix coding style

Signed-off-by: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>


  Commit: c98356f9fcfb501ae0f47beb17657756e1145b4f
      https://github.com/phpmyadmin/phpmyadmin/commit/c98356f9fcfb501ae0f47beb17657756e1145b4f
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

  Changed paths:
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Fix unit test

Signed-off-by: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>


  Commit: 5b5d50e471faa53d3b722b5bb8b8ecb440241ec5
      https://github.com/phpmyadmin/phpmyadmin/commit/5b5d50e471faa53d3b722b5bb8b8ecb440241ec5
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-10-22 (Wed, 22 Oct 2014)

  Changed paths:
    M libraries/String.class.php
    M libraries/StringByte.int.php
    M libraries/StringMB.class.php
    M libraries/StringNative.class.php
    M libraries/core.lib.php

  Log Message:
  -----------
  Fix phpdoc errors

Signed-off-by: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>


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

  Changed paths:
    M js/pmd/history.js
    M js/pmd/move.js
    M libraries/core.lib.php
    M libraries/db_designer.lib.php
    M themes/pmahomme/css/pmd.css.php

  Log Message:
  -----------
  Merge pull request #1383 from smita786/master

moving out inline js from db_designer.lib.php plus minor bug fixes


  Commit: 7aabfffac266889bef1bb645f0e9be7b07064247
      https://github.com/phpmyadmin/phpmyadmin/commit/7aabfffac266889bef1bb645f0e9be7b07064247
  Author: Dennis Jakobsen <dennis.jakobsen at gmail.com>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M po/da.po

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

Currently translated at 96.5% (2871 of 2973 strings)

[CI skip]


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

  Changed paths:
    M js/pmd/history.js
    M js/pmd/move.js
    M libraries/core.lib.php
    M libraries/db_designer.lib.php
    M themes/pmahomme/css/pmd.css.php

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


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

  Changed paths:
    M ChangeLog
    M server_privileges.php

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


  Commit: 181bd521695df2cae29da3d8be5f3976ad7ff2a0
      https://github.com/phpmyadmin/phpmyadmin/commit/181bd521695df2cae29da3d8be5f3976ad7ff2a0
  Author: Ion Adrian-Ionut <john at panevo.ro>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M po/ro.po

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

Currently translated at 60.8% (1809 of 2973 strings)

[CI skip]


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

  Changed paths:
    M ChangeLog
    M server_privileges.php

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


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

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Remove dead code

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


  Commit: 2290a1990c20b7ad6e4b2e71820953035c4d0806
      https://github.com/phpmyadmin/phpmyadmin/commit/2290a1990c20b7ad6e4b2e71820953035c4d0806
  Author: Ed Jr <edjacobjunior at gmail.com>
  Date:   2014-10-24 (Fri, 24 Oct 2014)

  Changed paths:
    M po/pt_BR.po

  Log Message:
  -----------
  Translated using Weblate (Portuguese (Brazil))

Currently translated at 94.1% (2798 of 2973 strings)

[CI skip]


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

  Changed paths:
    M libraries/sql.lib.php

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


  Commit: 5687d9792bb40a84c2da790b73637149102fc597
      https://github.com/phpmyadmin/phpmyadmin/commit/5687d9792bb40a84c2da790b73637149102fc597
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-24 (Fri, 24 Oct 2014)

  Changed paths:
    M libraries/Util.class.php

  Log Message:
  -----------
  Improve parameter doc

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


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

  Changed paths:
    M libraries/DatabaseInterface.class.php

  Log Message:
  -----------
  Fix parameter type warning

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


  Commit: 14bda32169ce4516ff015fc68fe334ed6556fd71
      https://github.com/phpmyadmin/phpmyadmin/commit/14bda32169ce4516ff015fc68fe334ed6556fd71
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M libraries/import.lib.php
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Fix delimiter reading.
Rum last SQL query.
Fix SQL reading.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 35bbe992d0c5bfff7fa95e68b767bf8dbd4965ef
      https://github.com/phpmyadmin/phpmyadmin/commit/35bbe992d0c5bfff7fa95e68b767bf8dbd4965ef
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M libraries/import.lib.php
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Remove var_dump.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: dec77b57960eb21f06c424e01444402c8ffbd55d
      https://github.com/phpmyadmin/phpmyadmin/commit/dec77b57960eb21f06c424e01444402c8ffbd55d
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Remove old import process.
Minor coding stylo modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: bbe0cc9c3cb0544fd87e0fcea31ff58e61cc4729
      https://github.com/phpmyadmin/phpmyadmin/commit/bbe0cc9c3cb0544fd87e0fcea31ff58e61cc4729
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Manage errors in import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: f53f9403662411efb75acbf659a19a6fab0fbc00
      https://github.com/phpmyadmin/phpmyadmin/commit/f53f9403662411efb75acbf659a19a6fab0fbc00
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Refactor.
Remove useless method.
Update comments.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 4060c088488f17784c74f1c8497546d7be9bd1ca
      https://github.com/phpmyadmin/phpmyadmin/commit/4060c088488f17784c74f1c8497546d7be9bd1ca
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Fix import.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Log Message:
  -----------
  Merge commit '2a67e33'


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

  Changed paths:
    M ChangeLog
    M js/makegrid.js

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


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  4.2.10.1 release date

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


  Commit: c6595420e804ece1d55bca97357fcd7398cf7521
      https://github.com/phpmyadmin/phpmyadmin/commit/c6595420e804ece1d55bca97357fcd7398cf7521
  Author: Fadhiil Rachman <fadhiilrachman at gmail.com>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M po/id.po

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

Currently translated at 71.8% (2136 of 2973 strings)

[CI skip]


  Commit: 4a229065905bc423ea90886b932a95bc06f0911c
      https://github.com/phpmyadmin/phpmyadmin/commit/4a229065905bc423ea90886b932a95bc06f0911c
  Author: Weblate <noreply at weblate.org>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M ChangeLog
    M js/makegrid.js

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


  Commit: b857bc0c9227c47bfae9828c16ad618f8a7d2eb9
      https://github.com/phpmyadmin/phpmyadmin/commit/b857bc0c9227c47bfae9828c16ad618f8a7d2eb9
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Log query while importing SQL.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 80869ba0ecc10bd3e681ad5d46603df81a224535
      https://github.com/phpmyadmin/phpmyadmin/commit/80869ba0ecc10bd3e681ad5d46603df81a224535
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M ChangeLog
    M js/pmd/designer_db.js
    M js/pmd/designer_page.js
    M js/pmd/history.js
    M js/pmd/move.js
    M js/server_status_monitor.js
    M js/tbl_chart.js
    M libraries/Config.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/String.class.php
    M libraries/StringByte.int.php
    M libraries/StringMB.class.php
    M libraries/StringNative.class.php
    M libraries/Util.class.php
    M libraries/common.inc.php
    M libraries/core.lib.php
    M libraries/db_designer.lib.php
    M libraries/relation.lib.php
    M libraries/sql.lib.php
    M po/cs.po
    M po/da.po
    M po/he.po
    M po/pt_BR.po
    M po/ro.po
    M server_privileges.php
    M test/classes/navigation/PMA_Node_test.php
    M themes/pmahomme/css/pmd.css.php

  Log Message:
  -----------
  Merge branch 'master' into stringFunctions_useStandardFunctions_master


  Commit: 1cbfa5612e59d04eff54997583ed0f710be34fda
      https://github.com/phpmyadmin/phpmyadmin/commit/1cbfa5612e59d04eff54997583ed0f710be34fda
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-25 (Sat, 25 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Refactor some code.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: c8b10dad328709e34d478948b4340d50618a2adb
      https://github.com/phpmyadmin/phpmyadmin/commit/c8b10dad328709e34d478948b4340d50618a2adb
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Improve data parsing.
Fix DELIMITER detection issue.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 2662295765558a05a1047c274d919ddaaafbf597
      https://github.com/phpmyadmin/phpmyadmin/commit/2662295765558a05a1047c274d919ddaaafbf597
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M libraries/create_addfield.lib.php

  Log Message:
  -----------
  Refactor code duplication

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


  Commit: cd75356587c016fe1a6a5f33e9773799380aa18d
      https://github.com/phpmyadmin/phpmyadmin/commit/cd75356587c016fe1a6a5f33e9773799380aa18d
  Author: Dadan Setia <da2n_s at yahoo.co.id>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M po/id.po

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

Currently translated at 74.2% (2206 of 2973 strings)

[CI skip]


  Commit: 5da5636527a3030ba2e1dd7239cf4b1a2b95db09
      https://github.com/phpmyadmin/phpmyadmin/commit/5da5636527a3030ba2e1dd7239cf4b1a2b95db09
  Author: Weblate <noreply at weblate.org>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M libraries/create_addfield.lib.php

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


  Commit: ba346c27318358cc9b28214a29095d0268e78549
      https://github.com/phpmyadmin/phpmyadmin/commit/ba346c27318358cc9b28214a29095d0268e78549
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-26 (Sun, 26 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Manage data as an attribute.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M libraries/DBQbe.class.php
    M libraries/Menu.class.php
    M test/classes/PMA_DBQbe_test.php

  Log Message:
  -----------
  Remove dead code

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


  Commit: 5d62fcbf78f8d40f12a1599858d4395d99deaf58
      https://github.com/phpmyadmin/phpmyadmin/commit/5d62fcbf78f8d40f12a1599858d4395d99deaf58
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-27 (Mon, 27 Oct 2014)

  Changed paths:
    M test/classes/PMA_DBQbe_test.php

  Log Message:
  -----------
  Fix coding style

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


  Commit: ddbcb5165a11af0c359c7427793e642809b91bdf
      https://github.com/phpmyadmin/phpmyadmin/commit/ddbcb5165a11af0c359c7427793e642809b91bdf
  Author: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M libraries/Util.class.php

  Log Message:
  -----------
  Fix unit tests

Signed-off-by: Ann + J.M <phpMyAdmin at ZweiSteinSoft.de>


  Commit: 90ee48f0bab4b6c473a6c7e60456771dc1a7c8d3
      https://github.com/phpmyadmin/phpmyadmin/commit/90ee48f0bab4b6c473a6c7e60456771dc1a7c8d3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M db_create.php
    M db_datadict.php
    M db_operations.php
    M db_printview.php
    M db_structure.php
    M db_tracking.php
    M export.php
    M import.php
    M index.php
    M js/db_search.js
    M js/server_status_monitor.js
    M js/server_status_processes.js
    M libraries/Advisor.class.php
    M libraries/DbSearch.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Menu.class.php
    M libraries/ServerStatusData.class.php
    M libraries/TableSearch.class.php
    M libraries/Util.class.php
    M libraries/build_html_for_db.lib.php
    M libraries/db_common.inc.php
    M libraries/db_table_exists.lib.php
    M libraries/display_import.lib.php
    M libraries/export.lib.php
    M libraries/navigation/Navigation.class.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_DatabaseChild.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/schema/Export_Relation_Schema.class.php
    M libraries/relation.lib.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_list.lib.php
    M libraries/rte/rte_main.inc.php
    M libraries/server_common.inc.php
    M libraries/server_databases.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_variables.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_common.inc.php
    M libraries/tracking.lib.php
    M libraries/url_generating.lib.php
    M prefs_forms.php
    M sql.php
    M tbl_addfield.php
    M tbl_create.php
    M tbl_printview.php
    M tbl_select.php
    M tbl_zoom_select.php
    M test/classes/PMA_DbSearch_test.php
    M test/classes/navigation/PMA_Navigation_test.php
    M test/classes/navigation/PMA_Node_DatabaseChild_test.php
    M test/libraries/PMA_generateCommonUrl_test.php
    M test/libraries/PMA_server_privileges_test.php

  Log Message:
  -----------
  Merge pull request #1384 from phpmyadmin/ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style

RFE 1550: PMA_URL_getCommon(): new style


  Commit: e85b43b8b2b56d728d9811da12fc4a4140547b55
      https://github.com/phpmyadmin/phpmyadmin/commit/e85b43b8b2b56d728d9811da12fc4a4140547b55
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Remove unused variable.
Rename parameter.
Update PHPDoc.
Fix data parsing.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 83789ce982d450fff8732e641fbdc003579b688f
      https://github.com/phpmyadmin/phpmyadmin/commit/83789ce982d450fff8732e641fbdc003579b688f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Log Message:
  -----------
  Merge commit '347d345'


  Commit: 62d04772edea2b7368ab921495deb16ccc2bb630
      https://github.com/phpmyadmin/phpmyadmin/commit/62d04772edea2b7368ab921495deb16ccc2bb630
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M ChangeLog
    M import.php

  Log Message:
  -----------
  Merge commit '2b4ed22'


  Commit: 027f18c9288dda90d5fe6d0212d6c34ea7dc08a5
      https://github.com/phpmyadmin/phpmyadmin/commit/027f18c9288dda90d5fe6d0212d6c34ea7dc08a5
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Log Message:
  -----------
  Merge commit '103ac4a'


  Commit: 3301bc3c8ecee9d4e3c41b2e8cd1c21f6d0bae1d
      https://github.com/phpmyadmin/phpmyadmin/commit/3301bc3c8ecee9d4e3c41b2e8cd1c21f6d0bae1d
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Display delimiter into SQL trace.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 3b3017d7aec9bc07a279b80ac39108d731575f46
      https://github.com/phpmyadmin/phpmyadmin/commit/3b3017d7aec9bc07a279b80ac39108d731575f46
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Manage SQL display.
Rename attributes.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M libraries/db_designer.lib.php

  Log Message:
  -----------
  Refactor code duplication

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


  Commit: 62171cb983cbd89bac1bb0115ed2c4489faf42d3
      https://github.com/phpmyadmin/phpmyadmin/commit/62171cb983cbd89bac1bb0115ed2c4489faf42d3
  Author: josep constanti <jconstanti at ovi.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M po/ca.po

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

Currently translated at 83.9% (2495 of 2973 strings)

[CI skip]


  Commit: cd4f3443f44a279a8bc64d76c0ff4aaff7ca5405
      https://github.com/phpmyadmin/phpmyadmin/commit/cd4f3443f44a279a8bc64d76c0ff4aaff7ca5405
  Author: Aputsiaq Niels Janussen <aj at isit.gl>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M po/da.po

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

Currently translated at 96.9% (2883 of 2973 strings)

[CI skip]


  Commit: eda8a2c3cac6270dedd17c6b8dfe85b4f2695ab9
      https://github.com/phpmyadmin/phpmyadmin/commit/eda8a2c3cac6270dedd17c6b8dfe85b4f2695ab9
  Author: Aso Naderi <aso.naderi at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M po/ckb.po

  Log Message:
  -----------
  Translated using Weblate (Kurdish Sorani)

Currently translated at 17.3% (515 of 2973 strings)

[CI skip]


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

  Changed paths:
    M libraries/db_designer.lib.php

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


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

  Changed paths:
    M libraries/DBQbe.class.php

  Log Message:
  -----------
  Fix undefined offset notice

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


  Commit: 7aeae208a33093f1920b709624f1aefb19526c38
      https://github.com/phpmyadmin/phpmyadmin/commit/7aeae208a33093f1920b709624f1aefb19526c38
  Author: Sevdimali İsa <sevdimaliisayev at mail.ru>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M po/az.po

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

Currently translated at 46.8% (1394 of 2973 strings)

[CI skip]


  Commit: 9991c3c499b20769fdfd98a339a182d1397f4a17
      https://github.com/phpmyadmin/phpmyadmin/commit/9991c3c499b20769fdfd98a339a182d1397f4a17
  Author: Yugal Pantola <yug.scorpio at gmail.com>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M po/hi.po

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

Currently translated at 42.4% (1263 of 2973 strings)

[CI skip]


  Commit: bdbfa880896d0da568ef1db18829705c8149ecb0
      https://github.com/phpmyadmin/phpmyadmin/commit/bdbfa880896d0da568ef1db18829705c8149ecb0
  Author: Aso Naderi <aso.naderi at gmail.com>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M po/ckb.po

  Log Message:
  -----------
  Translated using Weblate (Kurdish Sorani)

Currently translated at 17.7% (529 of 2973 strings)

[CI skip]


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

  Changed paths:
    M libraries/DBQbe.class.php

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


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

  Changed paths:
    M libraries/charset_conversion.lib.php

  Log Message:
  -----------
  Refactor code duplication

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


  Commit: e17de11c7438aef5e9f0773fcebda186e5648846
      https://github.com/phpmyadmin/phpmyadmin/commit/e17de11c7438aef5e9f0773fcebda186e5648846
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M changelog.php
    M db_operations.php
    M db_printview.php
    M examples/openid.php
    M export.php
    M file_echo.php
    M gis_data_editor.php
    M import.php
    M import_status.php
    M index.php
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    M libraries/DBQbe.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DbSearch.class.php
    M libraries/DisplayResults.class.php
    M libraries/Error.class.php
    M libraries/File.class.php
    M libraries/Font.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/Message.class.php
    M libraries/PDF.class.php
    M libraries/RecentFavoriteTable.class.php
    M libraries/Response.class.php
    M libraries/Scripts.class.php
    M libraries/ServerStatusData.class.php
    M libraries/StorageEngine.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Tracker.class.php
    M libraries/Types.class.php
    M libraries/Util.class.php
    M libraries/bookmark.lib.php
    M libraries/browse_foreigners.lib.php
    M libraries/build_html_for_db.lib.php
    M libraries/central_columns.lib.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config/Form.class.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/FormDisplay.tpl.php
    M libraries/config/ServerConfigChecks.class.php
    M libraries/config/Validator.class.php
    M libraries/config/user_preferences.forms.php
    M libraries/core.lib.php
    M libraries/db_common.inc.php
    M libraries/db_designer.lib.php
    M libraries/db_table_exists.lib.php
    M libraries/display_change_password.lib.php
    M libraries/display_export.lib.php
    M libraries/display_git_revision.lib.php
    M libraries/error_report.lib.php
    M libraries/export.lib.php
    M libraries/file_listing.lib.php
    M libraries/gis/GIS_Factory.class.php
    M libraries/gis/GIS_Geometry.class.php
    M libraries/gis/GIS_Geometrycollection.class.php
    M libraries/gis/GIS_Linestring.class.php
    M libraries/gis/GIS_Multilinestring.class.php
    M libraries/gis/GIS_Multipoint.class.php
    M libraries/gis/GIS_Multipolygon.class.php
    M libraries/gis/GIS_Point.class.php
    M libraries/gis/GIS_Polygon.class.php
    M libraries/gis/GIS_Visualization.class.php
    M libraries/iconv_wrapper.lib.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/ip_allow_deny.lib.php
    M libraries/mime.lib.php
    M libraries/mult_submits.inc.php
    M libraries/mult_submits.lib.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/normalization.lib.php
    M libraries/operations.lib.php
    M libraries/parse_analyze.inc.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/ImportPlugin.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/export/ExportCsv.class.php
    M libraries/plugins/export/ExportLatex.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportXml.class.php
    M libraries/plugins/export/TableProperty.class.php
    M libraries/plugins/import/ImportCsv.class.php
    M libraries/plugins/import/ImportMediawiki.class.php
    M libraries/plugins/import/ImportShp.class.php
    M libraries/plugins/import/ImportSql.class.php
    M libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
    M libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
    M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
    M libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
    M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
    M libraries/pmd_common.php
    M libraries/relation.lib.php
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_main.inc.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php
    M libraries/sanitizing.lib.php
    M libraries/select_lang.lib.php
    M libraries/server_databases.lib.php
    M libraries/server_plugins.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/server_status_processes.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_user_groups.lib.php
    M libraries/server_variables.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.lib.php
    A libraries/string.lib.php
    A libraries/stringMb.lib.php
    A libraries/stringNative.lib.php
    M libraries/structure.lib.php
    M libraries/sysinfo.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_indexes.lib.php
    M libraries/tbl_info.inc.php
    M libraries/tbl_relation.lib.php
    M libraries/tracking.lib.php
    M libraries/transformations.lib.php
    M libraries/url_generating.lib.php
    M prefs_manage.php
    M scripts/decode_bug.php
    M setup/frames/index.inc.php
    M setup/lib/ConfigGenerator.class.php
    M sql.php
    M tbl_addfield.php
    M tbl_change.php
    M tbl_chart.php
    M tbl_create.php
    M tbl_get_field.php
    M tbl_operations.php
    M tbl_printview.php
    M test/classes/PMA_Config_test.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    M test/classes/plugin/import/ImportCsv_test.php
    M test/libraries/PMA_central_columns_test.php
    M test/libraries/PMA_display_export_test.php
    M test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/core/PMA_warnMissingExtension_test.php
    A test/libraries/stringMb_test.php
    A test/libraries/stringNative_test.php
    A test/libraries/string_test_abstract.php
    M test/selenium/PmaSeleniumTableInsertTest.php
    M test/selenium/PmaSeleniumXssTest.php
    M test/selenium/TestBase.php
    M transformation_wrapper.php

  Log Message:
  -----------
  Improve multibytes string manipulation performances.
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 80ced5fe8f8cdcde7ff630ff073f2a339dcc0875
      https://github.com/phpmyadmin/phpmyadmin/commit/80ced5fe8f8cdcde7ff630ff073f2a339dcc0875
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M import.php
    M libraries/Config.class.php
    M libraries/DBQbe.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DisplayResults.class.php
    M libraries/ServerStatusData.class.php
    M libraries/Table.class.php
    M libraries/Util.class.php
    M libraries/common.inc.php
    M libraries/config/Form.class.php
    M libraries/core.lib.php
    M libraries/export.lib.php
    M libraries/gis/GIS_Geometrycollection.class.php
    M libraries/gis/GIS_Linestring.class.php
    M libraries/gis/GIS_Multipoint.class.php
    M libraries/gis/GIS_Multipolygon.class.php
    M libraries/gis/GIS_Point.class.php
    M libraries/gis/GIS_Polygon.class.php
    M libraries/import.lib.php
    M libraries/mult_submits.lib.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/import/ImportMediawiki.class.php
    M libraries/plugins/import/ImportShp.class.php
    M libraries/relation.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php
    M libraries/server_privileges.lib.php
    M libraries/sqlparser.lib.php
    M libraries/stringNative.lib.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/transformations.lib.php
    M sql.php
    M tbl_chart.php
    M tbl_printview.php

  Log Message:
  -----------
  Fix PHPCS issues.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: c0b0dc2e350312a02af25e3fa91144a62ea5d933
      https://github.com/phpmyadmin/phpmyadmin/commit/c0b0dc2e350312a02af25e3fa91144a62ea5d933
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Add PHPDoc comments in ImportSql.class.php.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


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

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  4.2.12-dev

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


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

  Log Message:
  -----------
  Merge commit '036549a'


  Commit: 3bf218519fbba9031043fc3547bbe78a20d0ec99
      https://github.com/phpmyadmin/phpmyadmin/commit/3bf218519fbba9031043fc3547bbe78a20d0ec99
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    R libraries/StringMB.class.php
    R libraries/StringNative.class.php
    R test/libraries/PMA_String_Compare_test.php

  Log Message:
  -----------
  Remove old manipulation string classes and tests.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 68554fd9202772fcfeb19c490aae93e55c6f2f7f
      https://github.com/phpmyadmin/phpmyadmin/commit/68554fd9202772fcfeb19c490aae93e55c6f2f7f
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M libraries/String.class.php

  Log Message:
  -----------
  Remove old manipulation string classes and tests.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 1911ece7edb30ebd105678499ab14646f45b2ef0
      https://github.com/phpmyadmin/phpmyadmin/commit/1911ece7edb30ebd105678499ab14646f45b2ef0
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M libraries/string.lib.php
    M test/libraries/stringMb_test.php
    M test/libraries/stringNative_test.php

  Log Message:
  -----------
  Add multibytes constants.
Update string tests.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 00efcadc33b0ba1211a502c3c7f68b505f09795d
      https://github.com/phpmyadmin/phpmyadmin/commit/00efcadc33b0ba1211a502c3c7f68b505f09795d
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: e1e2669841e91b40392dae5b24a9695419304db0
      https://github.com/phpmyadmin/phpmyadmin/commit/e1e2669841e91b40392dae5b24a9695419304db0
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    R test/libraries/PMA_StringMB_test.php
    R test/libraries/PMA_StringNative_test.php

  Log Message:
  -----------
  Remove old string manipulation test classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 7ecbd977e672b0605ac60b75794aa701ff71e1e4
      https://github.com/phpmyadmin/phpmyadmin/commit/7ecbd977e672b0605ac60b75794aa701ff71e1e4
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M test/libraries/PMA_generateCommonUrl_test.php
    M test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/PMA_string_test.php
    M test/libraries/PMA_tbl_chart_test.php
    M test/libraries/PMA_tbl_gis_visualization_test.php
    M test/libraries/PMA_zip_extension_test.php
    M test/libraries/common/PMA_getIcon_test.php
    M test/libraries/php-gettext/Locales_test.php
    M test/libraries/php-gettext/PMA_StringReader_test.php
    M test/libraries/php-gettext/Parsing_test.php
    M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php

  Log Message:
  -----------
  Minor code style modifications.
PHPDoc updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 2e130e8c361c7af3d7d612765df547aad5d871c9
      https://github.com/phpmyadmin/phpmyadmin/commit/2e130e8c361c7af3d7d612765df547aad5d871c9
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-01 (Sat, 01 Nov 2014)

  Changed paths:
    M libraries/tbl_columns_definition_form.lib.php
    M test/libraries/PMA_tbl_columns_definition_form_test.php

  Log Message:
  -----------
  Remove dead code

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


  Commit: f7b37d8d7233f9486a442dc1174f468f619f8759
      https://github.com/phpmyadmin/phpmyadmin/commit/f7b37d8d7233f9486a442dc1174f468f619f8759
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2014-11-01 (Sat, 01 Nov 2014)

  Changed paths:
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Column.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_Table.class.php

  Log Message:
  -----------
  Added title attr to links in navigation tree items

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: bdb5f333d7b279de6ff39bcdf92c92c4af80be20
      https://github.com/phpmyadmin/phpmyadmin/commit/bdb5f333d7b279de6ff39bcdf92c92c4af80be20
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-01 (Sat, 01 Nov 2014)

  Changed paths:
    M js/big_ints.js
    M js/common.js
    M js/console.js
    M js/error_report.js
    M js/export.js
    M js/functions.js
    M js/import.js
    M js/indexes.js
    M libraries/Console.class.php
    M libraries/DbSearch.class.php
    M libraries/Header.class.php
    M libraries/Menu.class.php
    M libraries/RecentFavoriteTable.class.php
    M libraries/Scripts.class.php
    M libraries/TableSearch.class.php
    M libraries/export.lib.php
    M libraries/gis/GIS_Polygon.class.php
    M libraries/insert_edit.lib.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_Index_Container.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/navigation/Nodes/Node_Trigger_Container.class.php
    M libraries/plugins/auth/AuthenticationHttp.class.php
    M libraries/plugins/transformations/abstract/Bool2TextTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/PreApPendTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/RegexValidationTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/TextFileUploadTransformationsPlugin.class.php
    M libraries/pmd_common.php
    M libraries/relation.lib.php
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_main.inc.php
    M libraries/server_bin_log.lib.php
    M libraries/server_privileges.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_gis_visualization.lib.php

  Log Message:
  -----------
  Fix PHPCS issues.
PHPDoc updates.
Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 58ed27560ccb78fb2b246f964b3f6637a7481686
      https://github.com/phpmyadmin/phpmyadmin/commit/58ed27560ccb78fb2b246f964b3f6637a7481686
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-01 (Sat, 01 Nov 2014)

  Changed paths:
    M libraries/plugins/auth/AuthenticationHttp.class.php

  Log Message:
  -----------
  Reverse modification to fix PHPUnit issue.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 270a4d45a80316b208d4d1a36aa330b4e21e0d3e
      https://github.com/phpmyadmin/phpmyadmin/commit/270a4d45a80316b208d4d1a36aa330b4e21e0d3e
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Log Message:
  -----------
  Merge commit '960efb0'


  Commit: d4cbccd78b5a0c126c065b850e2a8316f87e5065
      https://github.com/phpmyadmin/phpmyadmin/commit/d4cbccd78b5a0c126c065b850e2a8316f87e5065
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

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

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


  Commit: 92137a8c249de77ac91d3889327e9c0345df839b
      https://github.com/phpmyadmin/phpmyadmin/commit/92137a8c249de77ac91d3889327e9c0345df839b
  Author: Sevdimali İsa <sevdimaliisayev at mail.ru>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M po/az.po

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

Currently translated at 47.0% (1399 of 2973 strings)

[CI skip]


  Commit: 4139575bbcf0cc042edad8069be63dcb715041ba
      https://github.com/phpmyadmin/phpmyadmin/commit/4139575bbcf0cc042edad8069be63dcb715041ba
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

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

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


  Commit: 20cdc7408af173c33951ca12dc45e44a0dd66180
      https://github.com/phpmyadmin/phpmyadmin/commit/20cdc7408af173c33951ca12dc45e44a0dd66180
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Log Message:
  -----------
  Merge commit 'de4672d'


  Commit: d0bbf58d6fd5dd7f1767fa764ff9f3b55418f109
      https://github.com/phpmyadmin/phpmyadmin/commit/d0bbf58d6fd5dd7f1767fa764ff9f3b55418f109
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M libraries/operations.lib.php
    M libraries/server_databases.lib.php
    M libraries/sysinfo.lib.php

  Log Message:
  -----------
  Cleanup

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


  Commit: 037a034b437b493b05d98231aff3dc0eb17d459a
      https://github.com/phpmyadmin/phpmyadmin/commit/037a034b437b493b05d98231aff3dc0eb17d459a
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M db_sql_autocomplete.php
    M export.php
    M import.php
    M js/ajax.js
    M js/common.js
    M js/config.js
    M js/console.js
    M js/db_structure.js
    M js/functions.js
    M js/pmd/history.js
    M js/pmd/move.js
    M libraries/Console.class.php
    M libraries/config/Validator.class.php
    M libraries/core.lib.php
    M libraries/db_designer.lib.php
    M libraries/import.lib.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/sqlparser.lib.php
    M tbl_addfield.php
    M test/classes/PMA_TableSearch_test.php
    M test/libraries/PMA_generateCommonUrl_test.php

  Log Message:
  -----------
  Minor coding style modifications.
Fix typos.
PHPDoc and JSDoc updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 8f87009502d423c8fe5019dab89480598b1cc78e
      https://github.com/phpmyadmin/phpmyadmin/commit/8f87009502d423c8fe5019dab89480598b1cc78e
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M libraries/operations.lib.php
    M libraries/server_databases.lib.php
    M libraries/sysinfo.lib.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: fd7f02f929a53e4897714bef2b995bee8e96059f
      https://github.com/phpmyadmin/phpmyadmin/commit/fd7f02f929a53e4897714bef2b995bee8e96059f
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M db_import.php
    M error_report.php
    M libraries/Font.class.php
    M libraries/Index.class.php
    M libraries/StorageEngine.class.php
    M libraries/TableSearch.class.php
    M libraries/Theme.class.php
    M libraries/Tracker.class.php
    M libraries/Util.class.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/Validator.class.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/display_import_ajax.lib.php
    M libraries/engines/ndbcluster.lib.php
    M libraries/error_report.lib.php
    M libraries/navigation/Navigation.class.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NodeFactory.class.php
    M libraries/navigation/Nodes/Node.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_DatabaseChild.class.php
    M libraries/plugins/ExportPlugin.class.php
    M libraries/plugins/SchemaPlugin.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/import/ImportMediawiki.class.php
    M libraries/plugins/import/ImportSql.class.php
    M libraries/plugins/import/ShapeFile.class.php
    M libraries/plugins/schema/Export_Relation_Schema.class.php
    M libraries/plugins/schema/SchemaDia.class.php
    M libraries/plugins/schema/SchemaEps.class.php
    M libraries/plugins/schema/SchemaPdf.class.php
    M libraries/plugins/schema/SchemaSvg.class.php
    M libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
    M libraries/plugins/schema/dia/RelationStatsDia.class.php
    M libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
    M libraries/plugins/schema/eps/TableStatsEps.class.php
    M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
    M libraries/plugins/schema/pdf/TableStatsPdf.class.php
    M libraries/select_server.lib.php
    M libraries/server_privileges.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    M libraries/tbl_gis_visualization.lib.php
    M libraries/tbl_info.inc.php
    M libraries/tbl_views.lib.php
    M libraries/tracking.lib.php
    M libraries/transformations.lib.php
    M test/libraries/php-gettext/PMA_gettext_test.php
    M test/libraries/php-gettext/Parsing_test.php

  Log Message:
  -----------
  Fix typos.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 270b9e7a5de2966e2c4497186a07a1b27546b1fa
      https://github.com/phpmyadmin/phpmyadmin/commit/270b9e7a5de2966e2c4497186a07a1b27546b1fa
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M libraries/plugin_interface.lib.php
    M libraries/server_databases.lib.php

  Log Message:
  -----------
  Add and update PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: b1510fc535c45f1f3180a6149b6f7f392722dc53
      https://github.com/phpmyadmin/phpmyadmin/commit/b1510fc535c45f1f3180a6149b6f7f392722dc53
  Author: Chirayu Chiripal <chirayu.chiripal at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  add HHVM travis builds to allowed failures (HHVM 3.3.0)

Signed-off-by: Chirayu Chiripal <chirayu.chiripal at gmail.com>


  Commit: 5e7fa3b821886fda856262af72cb83c29808f16e
      https://github.com/phpmyadmin/phpmyadmin/commit/5e7fa3b821886fda856262af72cb83c29808f16e
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M libraries/DatabaseInterface.class.php
    M libraries/Util.class.php
    M libraries/insert_edit.lib.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/plugins/export/ExportHtmlword.class.php
    M libraries/plugins/export/ExportLatex.class.php
    M libraries/plugins/export/ExportTexytext.class.php
    M libraries/plugins/import/ShapeRecord.class.php
    M libraries/server_user_groups.lib.php

  Log Message:
  -----------
  Remove unused local variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 026c31fab67632aac5f5ea1720180d04fc7648a4
      https://github.com/phpmyadmin/phpmyadmin/commit/026c31fab67632aac5f5ea1720180d04fc7648a4
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M libraries/DatabaseInterface.class.php
    M libraries/replication_gui.lib.php
    M libraries/select_server.lib.php
    M libraries/server_privileges.lib.php

  Log Message:
  -----------
  Fix PHPCS issues.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 2b6833d87eb0b705d7c101ca13d91842879badff
      https://github.com/phpmyadmin/phpmyadmin/commit/2b6833d87eb0b705d7c101ca13d91842879badff
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: 01ffac5f39961aa597ed83cb1dc93860a68480bc
      https://github.com/phpmyadmin/phpmyadmin/commit/01ffac5f39961aa597ed83cb1dc93860a68480bc
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M libraries/plugins/import/ImportMediawiki.class.php

  Log Message:
  -----------
  Refactor code in ImportMediawiki.class.php.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: dc4b7fc2394ed999b6f2def1809d6e6f4892f1bb
      https://github.com/phpmyadmin/phpmyadmin/commit/dc4b7fc2394ed999b6f2def1809d6e6f4892f1bb
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M test/classes/PMA_Scripts_test.php

  Log Message:
  -----------
  Minor test update.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: eea3332acf66225661c5be77684df733dca1a3cc
      https://github.com/phpmyadmin/phpmyadmin/commit/eea3332acf66225661c5be77684df733dca1a3cc
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M test/classes/gis/PMA_GIS_Geometrycollection_test.php
    M test/classes/gis/PMA_GIS_Multipoint_test.php
    M test/classes/gis/PMA_GIS_Multipolygon_test.php
    M test/classes/gis/PMA_GIS_Point_test.php
    M test/classes/gis/PMA_GIS_Polygon_test.php

  Log Message:
  -----------
  Remove unused parameters.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 42e0bdd47a65f8a095ee6159332e19f7c3595ab5
      https://github.com/phpmyadmin/phpmyadmin/commit/42e0bdd47a65f8a095ee6159332e19f7c3595ab5
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M db_search.php
    M db_tracking.php
    M libraries/Advisor.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/File.class.php
    M libraries/TableSearch.class.php
    M libraries/Util.class.php
    M libraries/browse_foreigners.lib.php
    M libraries/central_columns.lib.php
    M libraries/config/FormDisplay.tpl.php
    M libraries/config/Validator.class.php
    M libraries/db_designer.lib.php
    M libraries/dbi/DBIDrizzle.class.php
    M libraries/insert_edit.lib.php
    M libraries/normalization.lib.php
    M libraries/operations.lib.php
    M libraries/plugins/auth/AuthenticationSignon.class.php
    M libraries/plugins/export/TableProperty.class.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_routines.lib.php
    M libraries/server_databases.lib.php
    M libraries/server_privileges.lib.php
    M libraries/sql.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_indexes.lib.php
    M libraries/tbl_relation.lib.php
    M libraries/tbl_views.lib.php
    M libraries/transformations.lib.php
    M libraries/vendor_config.php
    M libraries/zip.lib.php
    M libraries/zip_extension.lib.php
    M tbl_gis_visualization.php
    M tbl_replace.php
    M test/bootstrap-dist.php
    M test/classes/PMA_Advisor_test.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_Error_test.php
    M test/classes/PMA_Message_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/PMA_Types_MySQL_test.php
    M test/classes/_data/gen_version_info/info.inc.php
    M test/classes/dbi/DBIDrizzle_test.php
    M test/classes/gis/PMA_GIS_Geometry_test.php
    M test/classes/gis/PMA_GIS_Multilinestring_test.php
    M test/classes/gis/PMA_GIS_Multipolygon_test.php
    M test/classes/gis/PMA_GIS_Polygon_test.php
    M test/classes/navigation/PMA_Node_Database_test.php
    M test/classes/navigation/PMA_Node_test.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    M test/classes/plugin/import/ImportCsv_test.php
    M test/libraries/PMA_GIS_modifyQuery_test.php
    M test/libraries/PMA_import_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/PMA_select_server_test.php
    M test/libraries/PMA_server_privileges_test.php
    M test/libraries/PMA_sql_query_form_test.php
    M test/libraries/PMA_tbl_views_test.php
    M test/libraries/PMA_user_preferences_test.php
    M test/libraries/PMA_zip_test.php
    M test/selenium/PmaSeleniumTableBrowseTest.php
    M test/selenium/PmaSeleniumXssTest.php
    M view_create.php
    M webapp.php

  Log Message:
  -----------
  Fix typos.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: ef224381ea3033bda6331f280f1a7c4c2d212fe9
      https://github.com/phpmyadmin/phpmyadmin/commit/ef224381ea3033bda6331f280f1a7c4c2d212fe9
  Author: drainx <drainx1 at live.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M libraries/ServerStatusData.class.php

  Log Message:
  -----------
  Fix token error on Status menu items

Remove a '?' missed from a540e6ba878bae1fc352fadb8aad278a69f17365

Signed-off-by: Daniel Rix <drainx1 at live.com>


  Commit: 88089a76a7e7f28bacc127e2ac080f6d6bf7a06a
      https://github.com/phpmyadmin/phpmyadmin/commit/88089a76a7e7f28bacc127e2ac080f6d6bf7a06a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M .travis.yml
    M ChangeLog
    M changelog.php
    M db_create.php
    M db_datadict.php
    M db_import.php
    M db_operations.php
    M db_printview.php
    M db_search.php
    M db_sql_autocomplete.php
    M db_structure.php
    M db_tracking.php
    M error_report.php
    M examples/openid.php
    M export.php
    M file_echo.php
    M gis_data_editor.php
    M import.php
    M import_status.php
    M index.php
    M js/ajax.js
    M js/big_ints.js
    M js/common.js
    M js/config.js
    M js/console.js
    M js/db_search.js
    M js/db_structure.js
    M js/error_report.js
    M js/export.js
    M js/functions.js
    M js/import.js
    M js/indexes.js
    M js/makegrid.js
    M js/navigation.js
    M js/pmd/designer_db.js
    M js/pmd/designer_page.js
    M js/pmd/history.js
    M js/pmd/move.js
    M js/server_status_monitor.js
    M js/server_status_processes.js
    M js/tbl_chart.js
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    M libraries/Console.class.php
    M libraries/DBQbe.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DbSearch.class.php
    M libraries/DisplayResults.class.php
    M libraries/Error.class.php
    M libraries/File.class.php
    M libraries/Font.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/Message.class.php
    M libraries/PDF.class.php
    M libraries/RecentFavoriteTable.class.php
    M libraries/Response.class.php
    M libraries/Scripts.class.php
    M libraries/ServerStatusData.class.php
    M libraries/StorageEngine.class.php
    M libraries/String.class.php
    M libraries/StringByte.int.php
    R libraries/StringMB.class.php
    R libraries/StringNative.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Theme.class.php
    M libraries/Tracker.class.php
    M libraries/Types.class.php
    M libraries/Util.class.php
    M libraries/bookmark.lib.php
    M libraries/browse_foreigners.lib.php
    M libraries/build_html_for_db.lib.php
    M libraries/central_columns.lib.php
    M libraries/charset_conversion.lib.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config/Form.class.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/FormDisplay.tpl.php
    M libraries/config/ServerConfigChecks.class.php
    M libraries/config/Validator.class.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/core.lib.php
    M libraries/create_addfield.lib.php
    M libraries/db_common.inc.php
    M libraries/db_designer.lib.php
    M libraries/db_table_exists.lib.php
    M libraries/dbi/DBIDrizzle.class.php
    M libraries/display_change_password.lib.php
    M libraries/display_export.lib.php
    M libraries/display_git_revision.lib.php
    M libraries/display_import.lib.php
    M libraries/display_import_ajax.lib.php
    M libraries/engines/ndbcluster.lib.php
    M libraries/error_report.lib.php
    M libraries/export.lib.php
    M libraries/file_listing.lib.php
    M libraries/gis/GIS_Factory.class.php
    M libraries/gis/GIS_Geometry.class.php
    M libraries/gis/GIS_Geometrycollection.class.php
    M libraries/gis/GIS_Linestring.class.php
    M libraries/gis/GIS_Multilinestring.class.php
    M libraries/gis/GIS_Multipoint.class.php
    M libraries/gis/GIS_Multipolygon.class.php
    M libraries/gis/GIS_Point.class.php
    M libraries/gis/GIS_Polygon.class.php
    M libraries/gis/GIS_Visualization.class.php
    M libraries/iconv_wrapper.lib.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/ip_allow_deny.lib.php
    M libraries/mime.lib.php
    M libraries/mult_submits.inc.php
    M libraries/mult_submits.lib.php
    M libraries/navigation/Navigation.class.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/NodeFactory.class.php
    M libraries/navigation/Nodes/Node.class.php
    M libraries/navigation/Nodes/Node_Column.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_DatabaseChild.class.php
    M libraries/navigation/Nodes/Node_Index_Container.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/navigation/Nodes/Node_Trigger_Container.class.php
    M libraries/normalization.lib.php
    M libraries/operations.lib.php
    M libraries/parse_analyze.inc.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/ExportPlugin.class.php
    M libraries/plugins/ImportPlugin.class.php
    M libraries/plugins/SchemaPlugin.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/auth/AuthenticationSignon.class.php
    M libraries/plugins/export/ExportCsv.class.php
    M libraries/plugins/export/ExportHtmlword.class.php
    M libraries/plugins/export/ExportLatex.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportTexytext.class.php
    M libraries/plugins/export/ExportXml.class.php
    M libraries/plugins/export/TableProperty.class.php
    M libraries/plugins/import/ImportCsv.class.php
    M libraries/plugins/import/ImportMediawiki.class.php
    M libraries/plugins/import/ImportShp.class.php
    M libraries/plugins/import/ImportSql.class.php
    M libraries/plugins/import/ShapeFile.class.php
    M libraries/plugins/import/ShapeRecord.class.php
    M libraries/plugins/schema/Export_Relation_Schema.class.php
    M libraries/plugins/schema/SchemaDia.class.php
    M libraries/plugins/schema/SchemaEps.class.php
    M libraries/plugins/schema/SchemaPdf.class.php
    M libraries/plugins/schema/SchemaSvg.class.php
    M libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
    M libraries/plugins/schema/dia/RelationStatsDia.class.php
    M libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
    M libraries/plugins/schema/eps/TableStatsEps.class.php
    M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
    M libraries/plugins/schema/pdf/TableStatsPdf.class.php
    M libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
    M libraries/plugins/transformations/abstract/Bool2TextTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/PreApPendTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/RegexValidationTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/TextFileUploadTransformationsPlugin.class.php
    M libraries/pmd_common.php
    M libraries/relation.lib.php
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_list.lib.php
    M libraries/rte/rte_main.inc.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php
    M libraries/sanitizing.lib.php
    M libraries/select_lang.lib.php
    M libraries/select_server.lib.php
    M libraries/server_bin_log.lib.php
    M libraries/server_common.inc.php
    M libraries/server_databases.lib.php
    M libraries/server_plugins.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/server_status_processes.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_user_groups.lib.php
    M libraries/server_variables.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.lib.php
    A libraries/string.lib.php
    A libraries/stringMb.lib.php
    A libraries/stringNative.lib.php
    M libraries/structure.lib.php
    M libraries/sysinfo.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_common.inc.php
    M libraries/tbl_gis_visualization.lib.php
    M libraries/tbl_indexes.lib.php
    M libraries/tbl_info.inc.php
    M libraries/tbl_relation.lib.php
    M libraries/tbl_views.lib.php
    M libraries/tracking.lib.php
    M libraries/transformations.lib.php
    M libraries/url_generating.lib.php
    M libraries/vendor_config.php
    M libraries/zip.lib.php
    M libraries/zip_extension.lib.php
    M po/az.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/da.po
    M po/he.po
    M po/hi.po
    M po/id.po
    M po/pt_BR.po
    M po/ro.po
    M prefs_forms.php
    M prefs_manage.php
    M scripts/decode_bug.php
    M server_privileges.php
    M setup/frames/index.inc.php
    M setup/lib/ConfigGenerator.class.php
    M sql.php
    M tbl_addfield.php
    M tbl_change.php
    M tbl_chart.php
    M tbl_create.php
    M tbl_get_field.php
    M tbl_gis_visualization.php
    M tbl_operations.php
    M tbl_printview.php
    M tbl_replace.php
    M tbl_select.php
    M tbl_zoom_select.php
    M test/bootstrap-dist.php
    M test/classes/PMA_Advisor_test.php
    M test/classes/PMA_Config_test.php
    M test/classes/PMA_DBQbe_test.php
    M test/classes/PMA_DbSearch_test.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_Error_test.php
    M test/classes/PMA_Message_test.php
    M test/classes/PMA_Scripts_test.php
    M test/classes/PMA_TableSearch_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/PMA_Types_MySQL_test.php
    M test/classes/_data/gen_version_info/info.inc.php
    M test/classes/dbi/DBIDrizzle_test.php
    M test/classes/gis/PMA_GIS_Geometry_test.php
    M test/classes/gis/PMA_GIS_Geometrycollection_test.php
    M test/classes/gis/PMA_GIS_Multilinestring_test.php
    M test/classes/gis/PMA_GIS_Multipoint_test.php
    M test/classes/gis/PMA_GIS_Multipolygon_test.php
    M test/classes/gis/PMA_GIS_Point_test.php
    M test/classes/gis/PMA_GIS_Polygon_test.php
    M test/classes/navigation/PMA_Navigation_test.php
    M test/classes/navigation/PMA_Node_DatabaseChild_test.php
    M test/classes/navigation/PMA_Node_Database_test.php
    M test/classes/navigation/PMA_Node_test.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    M test/classes/plugin/import/ImportCsv_test.php
    M test/libraries/PMA_GIS_modifyQuery_test.php
    R test/libraries/PMA_StringMB_test.php
    R test/libraries/PMA_StringNative_test.php
    R test/libraries/PMA_String_Compare_test.php
    M test/libraries/PMA_central_columns_test.php
    M test/libraries/PMA_display_export_test.php
    M test/libraries/PMA_generateCommonUrl_test.php
    M test/libraries/PMA_import_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/PMA_select_server_test.php
    M test/libraries/PMA_server_privileges_test.php
    M test/libraries/PMA_sql_query_form_test.php
    M test/libraries/PMA_string_test.php
    M test/libraries/PMA_tbl_chart_test.php
    M test/libraries/PMA_tbl_columns_definition_form_test.php
    M test/libraries/PMA_tbl_gis_visualization_test.php
    M test/libraries/PMA_tbl_views_test.php
    M test/libraries/PMA_user_preferences_test.php
    M test/libraries/PMA_zip_extension_test.php
    M test/libraries/PMA_zip_test.php
    M test/libraries/common/PMA_getIcon_test.php
    M test/libraries/core/PMA_warnMissingExtension_test.php
    M test/libraries/php-gettext/Locales_test.php
    M test/libraries/php-gettext/PMA_StringReader_test.php
    M test/libraries/php-gettext/PMA_gettext_test.php
    M test/libraries/php-gettext/Parsing_test.php
    M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
    A test/libraries/stringMb_test.php
    A test/libraries/stringNative_test.php
    A test/libraries/string_test_abstract.php
    M test/selenium/PmaSeleniumTableBrowseTest.php
    M test/selenium/PmaSeleniumTableInsertTest.php
    M test/selenium/PmaSeleniumXssTest.php
    M test/selenium/TestBase.php
    M themes/pmahomme/css/pmd.css.php
    M transformation_wrapper.php
    M view_create.php
    M webapp.php

  Log Message:
  -----------
  Merge branch 'master' into Performance

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


  Commit: 3af9d58b81756a6dbd6a6d98c2c7d42a8b416cb6
      https://github.com/phpmyadmin/phpmyadmin/commit/3af9d58b81756a6dbd6a6d98c2c7d42a8b416cb6
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M libraries/ServerStatusData.class.php

  Log Message:
  -----------
  Merge pull request #1385 from drainx/master

Fix token error on Status menu items


  Commit: ebcc6c62f20881f7a6bdc53784a223c70d568c90
      https://github.com/phpmyadmin/phpmyadmin/commit/ebcc6c62f20881f7a6bdc53784a223c70d568c90
  Author: Perfectionist <drainx1 at live.com>
  Date:   2014-11-02 (Sun, 02 Nov 2014)

  Changed paths:
    M libraries/server_status_variables.lib.php

  Log Message:
  -----------
  Fix Status->All status variables to display correct suffix and formatting.

Broken by f9cd1a1a227d193dc8a70decb8e59607deb3e165

Signed-off-by: Daniel Rix <drainx1 at live.com>


  Commit: 79adf3d4b6fd22d1e5f40b3a18e2d71c5a3e0fcb
      https://github.com/phpmyadmin/phpmyadmin/commit/79adf3d4b6fd22d1e5f40b3a18e2d71c5a3e0fcb
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M test/libraries/PMA_central_columns_test.php

  Log Message:
  -----------
  Fix test failures

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


  Commit: d4873d08d06ecb8f8b2c3f835a2210d376b9c053
      https://github.com/phpmyadmin/phpmyadmin/commit/d4873d08d06ecb8f8b2c3f835a2210d376b9c053
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M libraries/Header.class.php
    M libraries/RecentFavoriteTable.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/relation.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    A tbl_recent_favorite.php
    M test/libraries/PMA_central_columns_test.php

  Log Message:
  -----------
  Merge pull request #1381 from madhuracj/Performance

Minor performance improvements


  Commit: 39a953fddd66c6e3d758fcf630fdd6fcc2932c4f
      https://github.com/phpmyadmin/phpmyadmin/commit/39a953fddd66c6e3d758fcf630fdd6fcc2932c4f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M test/travis.php.ini

  Log Message:
  -----------
  Configure timezone for Travis tests

Otherwise date related tests in HHVM fail.

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


  Commit: baa51312f530d12bf25e415d56982254d80ae21a
      https://github.com/phpmyadmin/phpmyadmin/commit/baa51312f530d12bf25e415d56982254d80ae21a
  Author: Dreezerd <dries.verschuere at outlook.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M po/en_GB.po

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

Currently translated at 91.2% (2713 of 2973 strings)

[CI skip]


  Commit: bd399095ff06f77e33f149ebd5803791dcb440be
      https://github.com/phpmyadmin/phpmyadmin/commit/bd399095ff06f77e33f149ebd5803791dcb440be
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M test/travis.php.ini

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


  Commit: 6cd819a92efaf0c9124a92045c180f96d0b15aa4
      https://github.com/phpmyadmin/phpmyadmin/commit/6cd819a92efaf0c9124a92045c180f96d0b15aa4
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M .travis.yml
    A test/travis-timezone.php.ini
    M test/travis.php.ini

  Log Message:
  -----------
  Split up Travis PHP config snippets

We want to se timezone always, but runkit is available only for some
versions.

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


  Commit: a0476824a96ca16b191223882819d641c546bc0f
      https://github.com/phpmyadmin/phpmyadmin/commit/a0476824a96ca16b191223882819d641c546bc0f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Add runkit support for PHP 5.6

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


  Commit: 11d92ad13e3197fb137f32dd23ff33874101ffbf
      https://github.com/phpmyadmin/phpmyadmin/commit/11d92ad13e3197fb137f32dd23ff33874101ffbf
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  This patch works only for 5.6

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


  Commit: 00f45c7956b4a051650cf20390b09bc6f4fc9460
      https://github.com/phpmyadmin/phpmyadmin/commit/00f45c7956b4a051650cf20390b09bc6f4fc9460
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M .travis.yml
    R test/travis-timezone.php.ini
    M test/travis.php.ini

  Log Message:
  -----------
  Revert "Split up Travis PHP config snippets"

This reverts commit 6cd819a92efaf0c9124a92045c180f96d0b15aa4.


  Commit: a42c4b9fab264cc02aa6c037d05db8cbaf1c530e
      https://github.com/phpmyadmin/phpmyadmin/commit/a42c4b9fab264cc02aa6c037d05db8cbaf1c530e
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M test/travis.php.ini

  Log Message:
  -----------
  Revert "Configure timezone for Travis tests"

This reverts commit 39a953fddd66c6e3d758fcf630fdd6fcc2932c4f.


  Commit: a5337bf0eafe378716f988fb21732ca5e957a743
      https://github.com/phpmyadmin/phpmyadmin/commit/a5337bf0eafe378716f988fb21732ca5e957a743
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M test/bootstrap-dist.php

  Log Message:
  -----------
  Set timezone in PHP snippet

There is no clean way to adjust HHVM settings from Travis, see
https://github.com/travis-ci/travis-ci/issues/2523

Caused by HHVM configuration no longer including timezone settings, see
https://github.com/travis-ci/travis-ci/issues/2812

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


  Commit: e38969de534efd83d8a9c0a2dc156c76781abe61
      https://github.com/phpmyadmin/phpmyadmin/commit/e38969de534efd83d8a9c0a2dc156c76781abe61
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge branch 'runkit'


  Commit: a73486da3da0e41a915d7b3cb28523fae7f04cb7
      https://github.com/phpmyadmin/phpmyadmin/commit/a73486da3da0e41a915d7b3cb28523fae7f04cb7
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M libraries/operations.lib.php

  Log Message:
  -----------
  Add mising space

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


  Commit: 54a9d84a1156c7d9ec53511bcfa9e719967aacb2
      https://github.com/phpmyadmin/phpmyadmin/commit/54a9d84a1156c7d9ec53511bcfa9e719967aacb2
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Remove duplicated condition and fixed phpcs error

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


  Commit: 43c0be8a84e1fe6f9360293bce599d36f606be47
      https://github.com/phpmyadmin/phpmyadmin/commit/43c0be8a84e1fe6f9360293bce599d36f606be47
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M libraries/server_status_variables.lib.php

  Log Message:
  -----------
  Merge pull request #1386 from drainx/master

Fix Status->All status variables to display correct suffix and formattin...


  Commit: 15c13e613c6c17dadb9a2a0ea2b0251bab4f99e2
      https://github.com/phpmyadmin/phpmyadmin/commit/15c13e613c6c17dadb9a2a0ea2b0251bab4f99e2
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M tbl_relation.php

  Log Message:
  -----------
  Fix code execution path warning

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


  Commit: f15e658b56a79f1473984f17fce9b3900cdfef3a
      https://github.com/phpmyadmin/phpmyadmin/commit/f15e658b56a79f1473984f17fce9b3900cdfef3a
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M libraries/plugins/import/ImportMediawiki.class.php

  Log Message:
  -----------
  Fix wrong test in ImportMediawiki.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 2b4d6c955e58bb9622be5460b1e3159f418e667a
      https://github.com/phpmyadmin/phpmyadmin/commit/2b4d6c955e58bb9622be5460b1e3159f418e667a
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M js/functions.js
    M libraries/operations.lib.php
    M libraries/sql.lib.php

  Log Message:
  -----------
  Remove duplicated js function.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 3ce934faba8233960d68ff4134017efdf7224017
      https://github.com/phpmyadmin/phpmyadmin/commit/3ce934faba8233960d68ff4134017efdf7224017
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  Break gigantic getData() method into smaller methods

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


  Commit: 0fc18eef29f7d76dae212498794c1b47b25de925
      https://github.com/phpmyadmin/phpmyadmin/commit/0fc18eef29f7d76dae212498794c1b47b25de925
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M .travis.yml
    M libraries/operations.lib.php
    M po/en_GB.po
    M test/bootstrap-dist.php

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


  Commit: a9d64610d2bc5f37fa25b0e111fb665f1c8e51de
      https://github.com/phpmyadmin/phpmyadmin/commit/a9d64610d2bc5f37fa25b0e111fb665f1c8e51de
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  Refactor getPresence() method into a set of smaller methods

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


  Commit: 15a806824f7112af93ef985d58fbc92d09f24a29
      https://github.com/phpmyadmin/phpmyadmin/commit/15a806824f7112af93ef985d58fbc92d09f24a29
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M libraries/tbl_relation.lib.php
    M tbl_relation.php

  Log Message:
  -----------
  Success message for internal relations

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


  Commit: f65871c1002ba31ffe3abe27fb71eeb360d834bf
      https://github.com/phpmyadmin/phpmyadmin/commit/f65871c1002ba31ffe3abe27fb71eeb360d834bf
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M libraries/tbl_relation.lib.php
    M tbl_relation.php

  Log Message:
  -----------
  Success message for display column change. Update display column in the database only if it has changed from the original value.

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


  Commit: 91b21184baeea78c4dbda134119ba1c563865838
      https://github.com/phpmyadmin/phpmyadmin/commit/91b21184baeea78c4dbda134119ba1c563865838
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M tbl_relation.php

  Log Message:
  -----------
  Use post params directly

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


  Commit: 69dee25e95fe45cf468a8ea394b24b0c39ddfd15
      https://github.com/phpmyadmin/phpmyadmin/commit/69dee25e95fe45cf468a8ea394b24b0c39ddfd15
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  $singleItem is a boolean variable

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


  Commit: 6df7ff8044b8f579e32b02babb5b222defd94910
      https://github.com/phpmyadmin/phpmyadmin/commit/6df7ff8044b8f579e32b02babb5b222defd94910
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M doc/config.rst
    M libraries/config.default.php

  Log Message:
  -----------
  Set the default value of 'FirstLevelNavigationItems' configuration to a lower value to avoid too much databases from loading in the initial page

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


  Commit: ea01a45edab07875face55d34ddb6a3f6b452096
      https://github.com/phpmyadmin/phpmyadmin/commit/ea01a45edab07875face55d34ddb6a3f6b452096
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M libraries/DisplayResults.class.php
    M libraries/server_status_variables.lib.php

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


  Commit: 3fc5da3e08a2e1e123dacd59c2b9b23160ac4a37
      https://github.com/phpmyadmin/phpmyadmin/commit/3fc5da3e08a2e1e123dacd59c2b9b23160ac4a37
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M tbl_relation.php

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


  Commit: 9d9b1f0ffb4603ad6f74f477c7174ac5633de01c
      https://github.com/phpmyadmin/phpmyadmin/commit/9d9b1f0ffb4603ad6f74f477c7174ac5633de01c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

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

  Log Message:
  -----------
  Update tests to the new default value of 'FirstLevelNavigationItems' config

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


  Commit: 15646eb24fb479b9fd39b64c326d583cbbbf4ad9
      https://github.com/phpmyadmin/phpmyadmin/commit/15646eb24fb479b9fd39b64c326d583cbbbf4ad9
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M libraries/plugins/import/ImportMediawiki.class.php

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


  Commit: 68501a6b16388fc0f9a8ed66e519544b27f57d09
      https://github.com/phpmyadmin/phpmyadmin/commit/68501a6b16388fc0f9a8ed66e519544b27f57d09
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

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

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: 1390d133f6164cdf99ae607a2ea1a472b5ed392c
      https://github.com/phpmyadmin/phpmyadmin/commit/1390d133f6164cdf99ae607a2ea1a472b5ed392c
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Minor modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: a8866653ec52fa51dc5232edf29a761ae5747f1b
      https://github.com/phpmyadmin/phpmyadmin/commit/a8866653ec52fa51dc5232edf29a761ae5747f1b
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M js/sql.js

  Log Message:
  -----------
  Fix merge error

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


  Commit: 05f01d9c2a9d0938ed64dc97672145ec9d05bf4d
      https://github.com/phpmyadmin/phpmyadmin/commit/05f01d9c2a9d0938ed64dc97672145ec9d05bf4d
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M index.php

  Log Message:
  -----------
  Split HTML markup from translatable string

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


  Commit: 3f8217141ad805a3ae64845b5636ecbffb1b56bd
      https://github.com/phpmyadmin/phpmyadmin/commit/3f8217141ad805a3ae64845b5636ecbffb1b56bd
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    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/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    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:
  -----------
  Update po files


  Commit: 346b62740ab25f5d325f4aa74aeadd8aad7236c4
      https://github.com/phpmyadmin/phpmyadmin/commit/346b62740ab25f5d325f4aa74aeadd8aad7236c4
  Author: Burak Yavuz <hitowerdigit at hotmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M po/tr.po

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

Currently translated at 100.0% (2976 of 2976 strings)

[CI skip]


  Commit: 4d16273018fa9c82da66f37f2d92e9461a37dce4
      https://github.com/phpmyadmin/phpmyadmin/commit/4d16273018fa9c82da66f37f2d92e9461a37dce4
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M ChangeLog
    M js/sql.js

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

Conflicts:
	js/sql.js

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


  Commit: 5b2fff405f440e2dcf63f87d4a6d05b9b5b9fce2
      https://github.com/phpmyadmin/phpmyadmin/commit/5b2fff405f440e2dcf63f87d4a6d05b9b5b9fce2
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M js/sql.js
    M js/tbl_structure.js

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

Conflicts:
	js/sql.js

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


  Commit: aa99164cc8d8170884cf55ace7588d29789b0435
      https://github.com/phpmyadmin/phpmyadmin/commit/aa99164cc8d8170884cf55ace7588d29789b0435
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M libraries/normalization.lib.php

  Log Message:
  -----------
  Escape column type as well. Enums may contain arbitrary value

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


  Commit: b6b371e8bd8c4aa51e61edf2cbf1d41459f2f5ce
      https://github.com/phpmyadmin/phpmyadmin/commit/b6b371e8bd8c4aa51e61edf2cbf1d41459f2f5ce
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M po/cs.po

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

Currently translated at 94.7% (2821 of 2976 strings)

[CI skip]


  Commit: e7319abe977e9a4772700b6b205f5c22be467645
      https://github.com/phpmyadmin/phpmyadmin/commit/e7319abe977e9a4772700b6b205f5c22be467645
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M po/fa.po

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

Currently translated at 28.6% (854 of 2976 strings)

[CI skip]


  Commit: 1bbaa22107820e68783622ec377be8bd7887c491
      https://github.com/phpmyadmin/phpmyadmin/commit/1bbaa22107820e68783622ec377be8bd7887c491
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M libraries/normalization.lib.php

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


  Commit: b6487bdc50b2d1adeb97c81c3b25b461ac784fb3
      https://github.com/phpmyadmin/phpmyadmin/commit/b6487bdc50b2d1adeb97c81c3b25b461ac784fb3
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M index.php
    M js/sql.js
    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/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    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:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


  Commit: 6f49ec5cc1ef450d95c149ab96093c40b3dbb928
      https://github.com/phpmyadmin/phpmyadmin/commit/6f49ec5cc1ef450d95c149ab96093c40b3dbb928
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M libraries/normalization.lib.php

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


  Commit: 51519584721141dd01e769e9bd4532657517c784
      https://github.com/phpmyadmin/phpmyadmin/commit/51519584721141dd01e769e9bd4532657517c784
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M libraries/normalization.lib.php

  Log Message:
  -----------
  Improve coding style

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


  Commit: 731294e338225e953721f1e85c6a0875ef3fa91d
      https://github.com/phpmyadmin/phpmyadmin/commit/731294e338225e953721f1e85c6a0875ef3fa91d
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M po/et.po

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

Currently translated at 100.0% (2976 of 2976 strings)

[CI skip]


  Commit: 69e49bac4a5d2971cded8515c015a0bc51ba34b3
      https://github.com/phpmyadmin/phpmyadmin/commit/69e49bac4a5d2971cded8515c015a0bc51ba34b3
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M po/fr.po

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

Currently translated at 100.0% (2976 of 2976 strings)

[CI skip]


  Commit: 6b6e48fa8f34c863cdf4d69656ac59440d138712
      https://github.com/phpmyadmin/phpmyadmin/commit/6b6e48fa8f34c863cdf4d69656ac59440d138712
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M po/fa.po

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

Currently translated at 28.6% (854 of 2976 strings)

[CI skip]


  Commit: 3abf4138eb0680d07866a647b38594dda2dab692
      https://github.com/phpmyadmin/phpmyadmin/commit/3abf4138eb0680d07866a647b38594dda2dab692
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M po/nl.po

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

Currently translated at 100.0% (2976 of 2976 strings)

[CI skip]


  Commit: f3e16baf53be92d7657f162d03b6eec3938f0adb
      https://github.com/phpmyadmin/phpmyadmin/commit/f3e16baf53be92d7657f162d03b6eec3938f0adb
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

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


  Commit: 3ecad073258e60fd532dbdf67317552426cf9d15
      https://github.com/phpmyadmin/phpmyadmin/commit/3ecad073258e60fd532dbdf67317552426cf9d15
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix merge conflict

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


  Commit: 74ece2e2204da2b205aee5c152a8b7c7a153ec45
      https://github.com/phpmyadmin/phpmyadmin/commit/74ece2e2204da2b205aee5c152a8b7c7a153ec45
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M libraries/structure.lib.php

  Log Message:
  -----------
  Remove PMA_String::strpos call.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: ee0d19069b2feeb46f462765a86cc434bf993c4b
      https://github.com/phpmyadmin/phpmyadmin/commit/ee0d19069b2feeb46f462765a86cc434bf993c4b
  Author: Yogeshwar Dan Charan <charanyogeshwar at gmail.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M po/hi.po

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

Currently translated at 42.6% (1268 of 2976 strings)

[CI skip]


  Commit: a2c5d82b9d69801b17fc61ff4dd27df717293b0d
      https://github.com/phpmyadmin/phpmyadmin/commit/a2c5d82b9d69801b17fc61ff4dd27df717293b0d
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M build.xml

  Log Message:
  -----------
  Fix configuration for jshint to generate checkstyle compatible reports

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


  Commit: 88e279ba46f96251974bd41cf0ae5708f3ca77d5
      https://github.com/phpmyadmin/phpmyadmin/commit/88e279ba46f96251974bd41cf0ae5708f3ca77d5
  Author: Yogeshwar <charanyogeshwar at gmail.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/hi.po

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

Currently translated at 42.6% (1270 of 2976 strings)

[CI skip]

Parameter's hindi is parameter itself.


  Commit: 0953dc9e20c4f36ce11eb0939aa22dacb35ac491
      https://github.com/phpmyadmin/phpmyadmin/commit/0953dc9e20c4f36ce11eb0939aa22dacb35ac491
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M build.xml

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


  Commit: 343d060ae8460abf0eeea34cebf2326211714f55
      https://github.com/phpmyadmin/phpmyadmin/commit/343d060ae8460abf0eeea34cebf2326211714f55
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

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


  Commit: 56b7e749c04bde734addd1de6024ddcaaa2ed90e
      https://github.com/phpmyadmin/phpmyadmin/commit/56b7e749c04bde734addd1de6024ddcaaa2ed90e
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Log Message:
  -----------
  Merge commit 'ad8ed1d041f69e21c4337d35d6d47079b2600517'


  Commit: 88ba587db8de5318d385ed744d8230c758ad5f69
      https://github.com/phpmyadmin/phpmyadmin/commit/88ba587db8de5318d385ed744d8230c758ad5f69
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M build.xml

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


  Commit: 7bd4029c9819fc483d677aac5a256e4399b2ceba
      https://github.com/phpmyadmin/phpmyadmin/commit/7bd4029c9819fc483d677aac5a256e4399b2ceba
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M scripts/update-po

  Log Message:
  -----------
  Merge commit '784166614942cc72da7dad0e4b37adc85c427b9b'


  Commit: 9bbc5796ecbfd279c786532e87d008ac118931cf
      https://github.com/phpmyadmin/phpmyadmin/commit/9bbc5796ecbfd279c786532e87d008ac118931cf
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

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


  Commit: 0dd843bf6ad864524073e0a26fee9e2dd2966013
      https://github.com/phpmyadmin/phpmyadmin/commit/0dd843bf6ad864524073e0a26fee9e2dd2966013
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    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/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    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:
  -----------
  Update po files

[CI skip]

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


  Commit: e49e9d82bddebb7edac0d9879766bc20be1e2d74
      https://github.com/phpmyadmin/phpmyadmin/commit/e49e9d82bddebb7edac0d9879766bc20be1e2d74
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M js/pmd/iecanvas.js

  Log Message:
  -----------
  Update to match ajax page loading mechanism

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


  Commit: a2b0a1e62055e8d07e5fe8af3c50a275f48a3617
      https://github.com/phpmyadmin/phpmyadmin/commit/a2b0a1e62055e8d07e5fe8af3c50a275f48a3617
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/hy.po

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

Currently translated at 3.3% (101 of 2976 strings)

[CI skip]


  Commit: 14072b3e92613a0bfeafd6096063f4bd35992341
      https://github.com/phpmyadmin/phpmyadmin/commit/14072b3e92613a0bfeafd6096063f4bd35992341
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/bn.po

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

Currently translated at 85.6% (2550 of 2976 strings)

[CI skip]


  Commit: 883a0f9e7f40ddfc4257dd10e0972aac3de5cc23
      https://github.com/phpmyadmin/phpmyadmin/commit/883a0f9e7f40ddfc4257dd10e0972aac3de5cc23
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/hu.po

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

Currently translated at 79.7% (2374 of 2976 strings)

[CI skip]


  Commit: 75ce3d15ef7d9521ee430307ad2108d88f16e3ff
      https://github.com/phpmyadmin/phpmyadmin/commit/75ce3d15ef7d9521ee430307ad2108d88f16e3ff
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/lv.po

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

Currently translated at 21.7% (646 of 2976 strings)

[CI skip]


  Commit: 6db82f39ca2b2b38107a778b11a5c6f85e2e7236
      https://github.com/phpmyadmin/phpmyadmin/commit/6db82f39ca2b2b38107a778b11a5c6f85e2e7236
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/mk.po

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

Currently translated at 18.5% (551 of 2976 strings)

[CI skip]


  Commit: b7e25f2b8f1101ef5b3620a6eba2095b8fbcde53
      https://github.com/phpmyadmin/phpmyadmin/commit/b7e25f2b8f1101ef5b3620a6eba2095b8fbcde53
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/ms.po

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

Currently translated at 11.7% (349 of 2976 strings)

[CI skip]


  Commit: 9b26bf5edaf1b4ce697a10e721e28cef6bc4374e
      https://github.com/phpmyadmin/phpmyadmin/commit/9b26bf5edaf1b4ce697a10e721e28cef6bc4374e
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/mn.po

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

Currently translated at 23.4% (698 of 2976 strings)

[CI skip]


  Commit: 8c6149136122ca6598e0d616ccd3adbbbbf36656
      https://github.com/phpmyadmin/phpmyadmin/commit/8c6149136122ca6598e0d616ccd3adbbbbf36656
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/pt_BR.po

  Log Message:
  -----------
  Translated using Weblate (Portuguese (Brazil))

Currently translated at 94.0% (2798 of 2976 strings)

[CI skip]


  Commit: a614ce29adcbae84d479ebb7abaa5f7c0ba6b0db
      https://github.com/phpmyadmin/phpmyadmin/commit/a614ce29adcbae84d479ebb7abaa5f7c0ba6b0db
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/zh_CN.po

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

Currently translated at 82.9% (2470 of 2976 strings)

[CI skip]


  Commit: c6b465003a0014b3910812680ab6ce3bd8e684e5
      https://github.com/phpmyadmin/phpmyadmin/commit/c6b465003a0014b3910812680ab6ce3bd8e684e5
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/tt.po

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

Currently translated at 18.7% (559 of 2976 strings)

[CI skip]


  Commit: 02e3a7f621f8ff6859aeb590f1c57f9ed57880ad
      https://github.com/phpmyadmin/phpmyadmin/commit/02e3a7f621f8ff6859aeb590f1c57f9ed57880ad
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/th.po

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

Currently translated at 35.3% (1052 of 2976 strings)

[CI skip]


  Commit: bf7cd06a422d16e663b89d2e974f5056d9ce01f7
      https://github.com/phpmyadmin/phpmyadmin/commit/bf7cd06a422d16e663b89d2e974f5056d9ce01f7
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/uz.po

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

Currently translated at 37.4% (1115 of 2976 strings)

[CI skip]


  Commit: 228cc9bb5f405785ed5479e1707f8fc92317095f
      https://github.com/phpmyadmin/phpmyadmin/commit/228cc9bb5f405785ed5479e1707f8fc92317095f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/uz at latin.po

  Log Message:
  -----------
  Translated using Weblate (Uzbek (latin))

Currently translated at 36.5% (1087 of 2976 strings)

[CI skip]


  Commit: e241fa56f1a2afc6af6304c407d75ef693162d71
      https://github.com/phpmyadmin/phpmyadmin/commit/e241fa56f1a2afc6af6304c407d75ef693162d71
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M js/pmd/iecanvas.js

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


  Commit: 5bd1dfe74937ab1963bc99305e921a20fde76869
      https://github.com/phpmyadmin/phpmyadmin/commit/5bd1dfe74937ab1963bc99305e921a20fde76869
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M ChangeLog
    M build.xml
    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/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    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 scripts/update-po

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


  Commit: 9e5d7550e0911a260b92ea654392ae9e16287503
      https://github.com/phpmyadmin/phpmyadmin/commit/9e5d7550e0911a260b92ea654392ae9e16287503
  Author: Panagiotis Papazoglou <papaz_p at yahoo.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M po/el.po

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

Currently translated at 100.0% (2976 of 2976 strings)

[CI skip]


  Commit: 65d46038afa91bcdb280db3d2704354704da1c69
      https://github.com/phpmyadmin/phpmyadmin/commit/65d46038afa91bcdb280db3d2704354704da1c69
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M view_create.php

  Log Message:
  -----------
  Cannot create view via Query results operation (master only)

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


  Commit: 25a591e3d7ac76f97140357248824cdbc11b68d2
      https://github.com/phpmyadmin/phpmyadmin/commit/25a591e3d7ac76f97140357248824cdbc11b68d2
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  Refactor code duplication

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


  Commit: 0bca6a096fe5d13a0a1b6b100be1fc651eddb90c
      https://github.com/phpmyadmin/phpmyadmin/commit/0bca6a096fe5d13a0a1b6b100be1fc651eddb90c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M libraries/DatabaseInterface.class.php
    M libraries/check_user_privileges.lib.php
    M libraries/navigation/Nodes/Node.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  Determine the databases the user has access to based on GRANTs and query only for them

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


  Commit: bc3eb6517e39499d1119b9ffedeaaa4a71c7212c
      https://github.com/phpmyadmin/phpmyadmin/commit/bc3eb6517e39499d1119b9ffedeaaa4a71c7212c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node_Database.class.php
    M po/bn.po
    M po/el.po
    M po/hu.po
    M po/hy.po
    M po/lv.po
    M po/mk.po
    M po/mn.po
    M po/ms.po
    M po/pt_BR.po
    M po/th.po
    M po/tt.po
    M po/uz.po
    M po/uz at latin.po
    M po/zh_CN.po
    M view_create.php

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


  Commit: 26bece58057cbdfbc58e23e54f83205e3d18dd8a
      https://github.com/phpmyadmin/phpmyadmin/commit/26bece58057cbdfbc58e23e54f83205e3d18dd8a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node.class.php

  Log Message:
  -----------
  Use GRANTs to determine the list of dbs to show.

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


  Commit: 7d800ed62f46072ab726ec850c80ddb320735bda
      https://github.com/phpmyadmin/phpmyadmin/commit/7d800ed62f46072ab726ec850c80ddb320735bda
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node.class.php

  Log Message:
  -----------
  Adhere to search clause and only db directive

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


  Commit: e46ff7db4980b5649b7bc089744d8ce9bb0556b7
      https://github.com/phpmyadmin/phpmyadmin/commit/e46ff7db4980b5649b7bc089744d8ce9bb0556b7
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node.class.php

  Log Message:
  -----------
  Sort database list

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


  Commit: 93d23e449493cce96b93088005da76cf54441ebd
      https://github.com/phpmyadmin/phpmyadmin/commit/93d23e449493cce96b93088005da76cf54441ebd
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

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

  Log Message:
  -----------
  Provide not IS based implementation

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


  Commit: 2e6d4752be5501486a23519d3168a023dd8ee0a2
      https://github.com/phpmyadmin/phpmyadmin/commit/2e6d4752be5501486a23519d3168a023dd8ee0a2
  Author: Mircəlal <01youknowme at gmail.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M po/az.po

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

Currently translated at 47.7% (1420 of 2976 strings)

[CI skip]


  Commit: 290ae63dd8a535f2104b8b88f87df60f50479d7a
      https://github.com/phpmyadmin/phpmyadmin/commit/290ae63dd8a535f2104b8b88f87df60f50479d7a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  Refactor code duplication

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


  Commit: 132ab7209ef2af6413cdd709d44b87bba722cb2a
      https://github.com/phpmyadmin/phpmyadmin/commit/132ab7209ef2af6413cdd709d44b87bba722cb2a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M po/az.po

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: 53f1364cfffc5722e1e269da0fe9243f5ec43a97
      https://github.com/phpmyadmin/phpmyadmin/commit/53f1364cfffc5722e1e269da0fe9243f5ec43a97
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node.class.php

  Log Message:
  -----------
  Fix bugs in navigation

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


  Commit: 09fa8dc8608a515a90ed2581678b270094be7cd6
      https://github.com/phpmyadmin/phpmyadmin/commit/09fa8dc8608a515a90ed2581678b270094be7cd6
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M test/classes/navigation/PMA_Node_test.php

  Log Message:
  -----------
  Fix failing tests

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


  Commit: 74e922b04820565f7724a503963e06eac27be1ad
      https://github.com/phpmyadmin/phpmyadmin/commit/74e922b04820565f7724a503963e06eac27be1ad
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M libraries/List_Database.class.php

  Log Message:
  -----------
  List_Database now adhere to DisableIS configuration

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


  Commit: efbd0a840775eb0ab76bea1cb79709aad5c67947
      https://github.com/phpmyadmin/phpmyadmin/commit/efbd0a840775eb0ab76bea1cb79709aad5c67947
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-07 (Fri, 07 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  Refactor code duplication

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 86fef4154d674c066a36f97816afc5ffb6efc1d0
      https://github.com/phpmyadmin/phpmyadmin/commit/86fef4154d674c066a36f97816afc5ffb6efc1d0
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-07 (Fri, 07 Nov 2014)

  Changed paths:
    M libraries/List_Database.class.php
    M libraries/check_user_privileges.lib.php

  Log Message:
  -----------
  Avoid notices

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 9c716a23531abccb160ff17c935db92394cbbb5c
      https://github.com/phpmyadmin/phpmyadmin/commit/9c716a23531abccb160ff17c935db92394cbbb5c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-07 (Fri, 07 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node_Database.class.php
    M po/az.po

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


  Commit: 9625ea3a98dab8646e4bc197f9a640f66f677507
      https://github.com/phpmyadmin/phpmyadmin/commit/9625ea3a98dab8646e4bc197f9a640f66f677507
  Author: josep constanti <jconstanti at ovi.com>
  Date:   2014-11-07 (Fri, 07 Nov 2014)

  Changed paths:
    M po/ca.po

  Log Message:
  -----------
  Translated using Weblate (Catalan)

Currently translated at 83.8% (2495 of 2976 strings)

[CI skip]


  Commit: 5e639c1c073790bc8bb81d00b39dac84572693ad
      https://github.com/phpmyadmin/phpmyadmin/commit/5e639c1c073790bc8bb81d00b39dac84572693ad
  Author: Michael Koch <michael.koch at enough.de>
  Date:   2014-11-07 (Fri, 07 Nov 2014)

  Changed paths:
    M po/de.po

  Log Message:
  -----------
  Translated using Weblate (German)

Currently translated at 99.8% (2973 of 2976 strings)

[CI skip]


  Commit: a01c75d2b784e201011c98cf4ae9e56a367c8262
      https://github.com/phpmyadmin/phpmyadmin/commit/a01c75d2b784e201011c98cf4ae9e56a367c8262
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-07 (Fri, 07 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 685b11617214ef721a6c9fe4ff18970d8177dda7
      https://github.com/phpmyadmin/phpmyadmin/commit/685b11617214ef721a6c9fe4ff18970d8177dda7
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

  Log Message:
  -----------
  Merge commit '2a58116'


  Commit: 065397cd84506032911dab884d738dd65ef30145
      https://github.com/phpmyadmin/phpmyadmin/commit/065397cd84506032911dab884d738dd65ef30145
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/tracking.lib.php
    M test/libraries/PMA_tbl_tracking_test.php

  Log Message:
  -----------
  Fix merge conflict

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: aa9700de689f79ba74239481f2a35068762fca66
      https://github.com/phpmyadmin/phpmyadmin/commit/aa9700de689f79ba74239481f2a35068762fca66
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Replace parameters by class attributes.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 458afb039192560ae18bedc06558082d46269222
      https://github.com/phpmyadmin/phpmyadmin/commit/458afb039192560ae18bedc06558082d46269222
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/tracking.lib.php
    M test/libraries/PMA_tbl_tracking_test.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: 6827afb2bde896598bb73fdfa7c481947f9224b4
      https://github.com/phpmyadmin/phpmyadmin/commit/6827afb2bde896598bb73fdfa7c481947f9224b4
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Replace parameters by class attributes.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 93c86da70021db8050e54f7c8014c8d9817e07e9
      https://github.com/phpmyadmin/phpmyadmin/commit/93c86da70021db8050e54f7c8014c8d9817e07e9
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

  Changed paths:
    M libraries/plugins/import/ImportMediawiki.class.php
    M libraries/plugins/import/ImportSql.class.php
    M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
    M libraries/rte/rte_events.lib.php
    M test/libraries/php-gettext/Locales_test.php
    M test/libraries/php-gettext/PMA_FileReader_test.php
    M test/libraries/php-gettext/PMA_StreamReader_test.php
    M test/libraries/php-gettext/PMA_StringReader_test.php
    M test/libraries/php-gettext/PMA_gettext_test.php
    M test/theme.php

  Log Message:
  -----------
  Minor style modifications.
PHPDoc update.
Reduce nested levels.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: a93288e5085e35f9ce53f2c67855e217bd64e4ed
      https://github.com/phpmyadmin/phpmyadmin/commit/a93288e5085e35f9ce53f2c67855e217bd64e4ed
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

  Changed paths:
    M libraries/rte/rte_events.lib.php
    A libraries/rte/rte_general.lib.php
    M libraries/rte/rte_main.inc.php
    M libraries/rte/rte_routines.lib.php

  Log Message:
  -----------
  Reduce nested levels.
Remove unused local variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 076ff24cb368e760fc47cd32c0f8e1b858d7cd8b
      https://github.com/phpmyadmin/phpmyadmin/commit/076ff24cb368e760fc47cd32c0f8e1b858d7cd8b
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

  Changed paths:
    M libraries/rte/rte_routines.lib.php

  Log Message:
  -----------
  PHPDoc update.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 604edcbd440b0dc404be001da2486aea30fdd628
      https://github.com/phpmyadmin/phpmyadmin/commit/604edcbd440b0dc404be001da2486aea30fdd628
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

  Changed paths:
    M libraries/rte/rte_routines.lib.php

  Log Message:
  -----------
  Remove unused local variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 80eb1091ee303d07330f671dbe3eac886e911a25
      https://github.com/phpmyadmin/phpmyadmin/commit/80eb1091ee303d07330f671dbe3eac886e911a25
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

  Changed paths:
    M libraries/rte/rte_triggers.lib.php

  Log Message:
  -----------
  Refactorise code.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: fe3941b9bda2ea60a1966bf2bc0c8867f6c25aa7
      https://github.com/phpmyadmin/phpmyadmin/commit/fe3941b9bda2ea60a1966bf2bc0c8867f6c25aa7
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Fix #4495 Comment lines in multiquery

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 8a3af94d3571e60de9b408f7a8a0c64ba0cc34a1
      https://github.com/phpmyadmin/phpmyadmin/commit/8a3af94d3571e60de9b408f7a8a0c64ba0cc34a1
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M libraries/tracking.lib.php

  Log Message:
  -----------
  Refactor code duplication

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 49836e6e6f041be6388bdd827cfde28b8d53b27d
      https://github.com/phpmyadmin/phpmyadmin/commit/49836e6e6f041be6388bdd827cfde28b8d53b27d
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M db_structure.php
    M libraries/ServerStatusData.class.php
    M libraries/replication.inc.php
    M libraries/server_databases.lib.php
    M libraries/server_status.lib.php
    M libraries/structure.lib.php
    M server_replication.php
    M server_status.php
    M server_status_advisor.php
    M server_status_monitor.php
    M server_status_processes.php
    M server_status_queries.php
    M server_status_variables.php
    M test/classes/PMA_ServerStatusData_test.php
    M test/libraries/PMA_server_databases_test.php
    M test/libraries/PMA_server_status_advisor_test.php
    M test/libraries/PMA_server_status_monitor_test.php
    M test/libraries/PMA_server_status_processes_test.php
    M test/libraries/PMA_server_status_queries_test.php
    M test/libraries/PMA_server_status_test.php
    M test/libraries/PMA_server_status_variables_test.php

  Log Message:
  -----------
  Use $replication_info everywhere, instead of $server_* variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 4922230bb687e9ff56c93fef915390d8c36627c5
      https://github.com/phpmyadmin/phpmyadmin/commit/4922230bb687e9ff56c93fef915390d8c36627c5
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M libraries/StorageEngine.class.php
    M test/libraries/PMA_server_engines_test.php

  Log Message:
  -----------
  Add test for PMA_StorageEngine::getEngine.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 2768d398b55382561a2caebae6720b0d44d01235
      https://github.com/phpmyadmin/phpmyadmin/commit/2768d398b55382561a2caebae6720b0d44d01235
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M libraries/import.lib.php

  Log Message:
  -----------
  Reduce nesting levels.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 19cb4a7eb90c1c4ced914be6b30f7cc8cc2aff8f
      https://github.com/phpmyadmin/phpmyadmin/commit/19cb4a7eb90c1c4ced914be6b30f7cc8cc2aff8f
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M test/libraries/PMA_server_engines_test.php

  Log Message:
  -----------
  Fix PHPDoc for provider.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 7a6085344369d2c716831e80135ef60bc894c5fa
      https://github.com/phpmyadmin/phpmyadmin/commit/7a6085344369d2c716831e80135ef60bc894c5fa
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M db_create.php
    M db_structure.php
    M libraries/replication.inc.php
    M server_databases.php
    M server_replication.php
    M server_status.php
    M server_status_advisor.php
    M server_status_monitor.php
    M server_status_processes.php
    M server_status_queries.php
    M server_status_variables.php

  Log Message:
  -----------
  Replace $replication_info by a global variable.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: b6f390ef09d39c0f1710a396c4deab3b5d29bfe8
      https://github.com/phpmyadmin/phpmyadmin/commit/b6f390ef09d39c0f1710a396c4deab3b5d29bfe8
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M libraries/structure.lib.php

  Log Message:
  -----------
  Fix PHPCS issues.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 1110aa3c0e236cf50315866a1ae2dd3f1796ccf1
      https://github.com/phpmyadmin/phpmyadmin/commit/1110aa3c0e236cf50315866a1ae2dd3f1796ccf1
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M libraries/structure.lib.php

  Log Message:
  -----------
  Fix undefined variable.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: ed51a25c8f9f9db4bc2310de8b737007b2bacae6
      https://github.com/phpmyadmin/phpmyadmin/commit/ed51a25c8f9f9db4bc2310de8b737007b2bacae6
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Allow import SQL without delimiter till EOF.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 5c739d6c2d18cea6816f73d0fc6b223cb4d744ef
      https://github.com/phpmyadmin/phpmyadmin/commit/5c739d6c2d18cea6816f73d0fc6b223cb4d744ef
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M test/classes/PMA_List_Database_test.php

  Log Message:
  -----------
  Define variables needed for testing

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 63861210d8e581113285a02366aa6bbb16c0fba5
      https://github.com/phpmyadmin/phpmyadmin/commit/63861210d8e581113285a02366aa6bbb16c0fba5
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M libraries/Util.class.php

  Log Message:
  -----------
  Partial fix for bug #4581 Some links in query_result doesn't work


  Commit: 2377ba4dd7dac32ace697d21a8fd3d961bc06d61
      https://github.com/phpmyadmin/phpmyadmin/commit/2377ba4dd7dac32ace697d21a8fd3d961bc06d61
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M ChangeLog
    M js/ajax.js
    M libraries/Footer.class.php
    M libraries/Response.class.php
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  bug #4582 Debug SQL works only for the first page

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: da07378c3647cd6dabae2a3f18c99707e1a88acf
      https://github.com/phpmyadmin/phpmyadmin/commit/da07378c3647cd6dabae2a3f18c99707e1a88acf
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M js/navigation.js

  Log Message:
  -----------
  Allow debugging queries executed by the navigation panel

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: dfea0a4fa0a477f8d9c537670bd1a15d22a17898
      https://github.com/phpmyadmin/phpmyadmin/commit/dfea0a4fa0a477f8d9c537670bd1a15d22a17898
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M test/classes/PMA_Footer_test.php

  Log Message:
  -----------
  Fix footer test

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 686924d628c8a0ef635a47fe3b5b450da7c6d6e6
      https://github.com/phpmyadmin/phpmyadmin/commit/686924d628c8a0ef635a47fe3b5b450da7c6d6e6
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M test/classes/PMA_Footer_test.php

  Log Message:
  -----------
  Update doc comment

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: a1c15902546e65037c7dc5a24c4ac3d56148aaf4
      https://github.com/phpmyadmin/phpmyadmin/commit/a1c15902546e65037c7dc5a24c4ac3d56148aaf4
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M libraries/Menu.class.php

  Log Message:
  -----------
  Cache binary_logs variable

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 2d8fa546e1f8e74d8056d9c1e02d9cbb72f82df2
      https://github.com/phpmyadmin/phpmyadmin/commit/2d8fa546e1f8e74d8056d9c1e02d9cbb72f82df2
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for bug #3869

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 19e146ee4bf045ee6dd40740bf452a2152d696fd
      https://github.com/phpmyadmin/phpmyadmin/commit/19e146ee4bf045ee6dd40740bf452a2152d696fd
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node.class.php

  Log Message:
  -----------
  Correctly match with separator

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: ab3a82fb25c0131bf7a5eeb0b761b2c641f4d9a7
      https://github.com/phpmyadmin/phpmyadmin/commit/ab3a82fb25c0131bf7a5eeb0b761b2c641f4d9a7
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M libraries/navigation/Nodes/Node.class.php

  Log Message:
  -----------
  Eliminate duplicates

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 89ae63ddf96b829edc3e434fd32e0178e1266ebd
      https://github.com/phpmyadmin/phpmyadmin/commit/89ae63ddf96b829edc3e434fd32e0178e1266ebd
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  Merge pull request #1392 from Tithugues/SQLWithoutDelimiter_master

Allow import SQL without delimiter till EOF.


  Commit: 8e6d16cf7e11ffd2fc20e22b6708c36d3b66d14d
      https://github.com/phpmyadmin/phpmyadmin/commit/8e6d16cf7e11ffd2fc20e22b6708c36d3b66d14d
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M db_create.php
    M db_structure.php
    M libraries/ServerStatusData.class.php
    M libraries/replication.inc.php
    M libraries/server_databases.lib.php
    M libraries/server_status.lib.php
    M libraries/structure.lib.php
    M server_databases.php
    M server_replication.php
    M server_status.php
    M server_status_advisor.php
    M server_status_monitor.php
    M server_status_processes.php
    M server_status_queries.php
    M server_status_variables.php
    M test/classes/PMA_ServerStatusData_test.php
    M test/libraries/PMA_server_databases_test.php
    M test/libraries/PMA_server_status_advisor_test.php
    M test/libraries/PMA_server_status_monitor_test.php
    M test/libraries/PMA_server_status_processes_test.php
    M test/libraries/PMA_server_status_queries_test.php
    M test/libraries/PMA_server_status_test.php
    M test/libraries/PMA_server_status_variables_test.php

  Log Message:
  -----------
  Merge pull request #1389 from Tithugues/replicationInfo_master

Use $replication_info everywhere, instead of $server_* variables.


  Commit: 58c629f6fd6f9b58aba384ba4f9f970e1dba7b88
      https://github.com/phpmyadmin/phpmyadmin/commit/58c629f6fd6f9b58aba384ba4f9f970e1dba7b88
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M ChangeLog
    M db_create.php
    M db_structure.php
    M js/ajax.js
    M js/navigation.js
    M libraries/Footer.class.php
    M libraries/Menu.class.php
    M libraries/Response.class.php
    M libraries/ServerStatusData.class.php
    M libraries/StorageEngine.class.php
    M libraries/Util.class.php
    M libraries/import.lib.php
    M libraries/navigation/Nodes/Node.class.php
    M libraries/plugins/import/ImportSql.class.php
    M libraries/replication.inc.php
    M libraries/server_databases.lib.php
    M libraries/server_status.lib.php
    M libraries/structure.lib.php
    M libraries/tracking.lib.php
    M server_databases.php
    M server_replication.php
    M server_status.php
    M server_status_advisor.php
    M server_status_monitor.php
    M server_status_processes.php
    M server_status_queries.php
    M server_status_variables.php
    M test/classes/PMA_Footer_test.php
    M test/classes/PMA_List_Database_test.php
    M test/classes/PMA_ServerStatusData_test.php
    M test/libraries/PMA_server_databases_test.php
    M test/libraries/PMA_server_engines_test.php
    M test/libraries/PMA_server_status_advisor_test.php
    M test/libraries/PMA_server_status_monitor_test.php
    M test/libraries/PMA_server_status_processes_test.php
    M test/libraries/PMA_server_status_queries_test.php
    M test/libraries/PMA_server_status_test.php
    M test/libraries/PMA_server_status_variables_test.php
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Merge branch 'master' into b4495_master

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>

Conflicts:
	ChangeLog


  Commit: f74ed544f68bc56866503f46ea2b777076b096aa
      https://github.com/phpmyadmin/phpmyadmin/commit/f74ed544f68bc56866503f46ea2b777076b096aa
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M libraries/tracking.lib.php

  Log Message:
  -----------
  Remove trailing whitespace.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: c80ab105390875592e4f26c789b313258ac6ee3b
      https://github.com/phpmyadmin/phpmyadmin/commit/c80ab105390875592e4f26c789b313258ac6ee3b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/plugins/import/ImportSql.class.php
    M libraries/tracking.lib.php

  Log Message:
  -----------
  Merge pull request #1388 from Tithugues/b4495_master

Fix #4495 Comment lines in multiquery


  Commit: cb94250d0854e56aa70c03c99581690a5f6cc384
      https://github.com/phpmyadmin/phpmyadmin/commit/cb94250d0854e56aa70c03c99581690a5f6cc384
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M db_structure.php

  Log Message:
  -----------
  Minor coding style modifications.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: bef5f3cb5b24be842e2420a59242c6a34eaa7ad7
      https://github.com/phpmyadmin/phpmyadmin/commit/bef5f3cb5b24be842e2420a59242c6a34eaa7ad7
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M libraries/tracking.lib.php

  Log Message:
  -----------
  Refactor code duplication

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: b417fd62e1a3be38b8460ba01bf9ae2e2d7c466c
      https://github.com/phpmyadmin/phpmyadmin/commit/b417fd62e1a3be38b8460ba01bf9ae2e2d7c466c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M db_structure.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: 64264411541b7630a3ad19b1b275099d35b79a8d
      https://github.com/phpmyadmin/phpmyadmin/commit/64264411541b7630a3ad19b1b275099d35b79a8d
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Fix display issue of #4569.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 516352237bd4db27f7c13b139db14ecb5f93a385
      https://github.com/phpmyadmin/phpmyadmin/commit/516352237bd4db27f7c13b139db14ecb5f93a385
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M libraries/tracking.lib.php

  Log Message:
  -----------
  Fix undefined index notices

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: a4c2cfea879f1cf221d81804ce1d6fbd30039788
      https://github.com/phpmyadmin/phpmyadmin/commit/a4c2cfea879f1cf221d81804ce1d6fbd30039788
  Author: Nisarg Jhaveri <nisarg.jhaveri at research.iiit.ac.in>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M js/rte.js

  Log Message:
  -----------
  SQL autocomplete in RTE editors

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri at research.iiit.ac.in>


  Commit: fb130bf20d2f572eeefaa6a96d3e616fad6db8f4
      https://github.com/phpmyadmin/phpmyadmin/commit/fb130bf20d2f572eeefaa6a96d3e616fad6db8f4
  Author: Nisarg Jhaveri <nisarg.jhaveri at research.iiit.ac.in>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M libraries/plugins/export/ExportSql.class.php

  Log Message:
  -----------
  Fixed typo in SQL export

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri at research.iiit.ac.in>


  Commit: bade25f7472c2379947979b38df1b4969696d721
      https://github.com/phpmyadmin/phpmyadmin/commit/bade25f7472c2379947979b38df1b4969696d721
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M libraries/plugins/export/ExportSql.class.php

  Log Message:
  -----------
  Merge pull request #1395 from nisargjhaveri/typoInExport

Fixed typo in SQL export


  Commit: a68ea85d4d7456edd3907ee8d63ea79607929b94
      https://github.com/phpmyadmin/phpmyadmin/commit/a68ea85d4d7456edd3907ee8d63ea79607929b94
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M libraries/plugins/schema/eps/RelationStatsEps.class.php
    M libraries/pmd_common.php
    M libraries/rte/rte_footer.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/tbl_relation.lib.php
    M test/classes/PMA_Table_test.php
    M test/classes/dbi/DBIDrizzle_test.php
    M test/classes/dbi/DBIMysqli_test.php
    M test/classes/plugin/export/PMA_ExportMediawiki_test.php
    M test/classes/plugin/import/ImportLdi_test.php
    M test/libraries/PMA_mult_submits_test.php
    M test/libraries/PMA_mysql_charsets_test.php
    M test/libraries/PMA_server_replication_test.php
    M test/libraries/PMA_server_status_queries_test.php
    M test/libraries/PMA_tbl_indexes_test.php
    M test/libraries/PMA_tbl_printview_test.php
    M test/libraries/PMA_tbl_tracking_test.php
    M test/libraries/PMA_user_preferences_test.php
    M test/libraries/rte/PMA_RTN_getDataFromRequest_test.php

  Log Message:
  -----------
  Remove unused locale variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 13b5690bacbeda45dc133806761874bf4586a98a
      https://github.com/phpmyadmin/phpmyadmin/commit/13b5690bacbeda45dc133806761874bf4586a98a
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M libraries/plugins/schema/RelationStats.class.php
    M libraries/plugins/schema/eps/RelationStatsEps.class.php
    M libraries/plugins/schema/pdf/RelationStatsPdf.class.php
    M libraries/plugins/schema/svg/RelationStatsSvg.class.php

  Log Message:
  -----------
  Fix typo in class name.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: b61ea0a10c496062c11ebdeae6e7c3a28457a4e3
      https://github.com/phpmyadmin/phpmyadmin/commit/b61ea0a10c496062c11ebdeae6e7c3a28457a4e3
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M libraries/plugins/export/ExportSql.class.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: 3b3bd0c2eb477406f507a51e288b5fd78054565b
      https://github.com/phpmyadmin/phpmyadmin/commit/3b3bd0c2eb477406f507a51e288b5fd78054565b
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M ChangeLog
    M js/rte.js
    M libraries/sql.lib.php

  Log Message:
  -----------
  Merge branch 'QA_4_2'

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: a0f348beea09962ed7e608d4e38dc1119bb19efa
      https://github.com/phpmyadmin/phpmyadmin/commit/a0f348beea09962ed7e608d4e38dc1119bb19efa
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M libraries/plugins/schema/eps/RelationStatsEps.class.php
    M libraries/pmd_common.php
    M libraries/rte/rte_footer.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/tbl_relation.lib.php
    M test/classes/PMA_Table_test.php
    M test/classes/dbi/DBIDrizzle_test.php
    M test/classes/dbi/DBIMysqli_test.php
    M test/classes/plugin/export/PMA_ExportMediawiki_test.php
    M test/classes/plugin/import/ImportLdi_test.php
    M test/libraries/PMA_mult_submits_test.php
    M test/libraries/PMA_mysql_charsets_test.php
    M test/libraries/PMA_server_replication_test.php
    M test/libraries/PMA_server_status_queries_test.php
    M test/libraries/PMA_tbl_indexes_test.php
    M test/libraries/PMA_tbl_printview_test.php
    M test/libraries/PMA_tbl_tracking_test.php
    M test/libraries/PMA_user_preferences_test.php
    M test/libraries/rte/PMA_RTN_getDataFromRequest_test.php

  Log Message:
  -----------
  Merge branch 'removeUnusedVariables_master'


  Commit: 6991720ea2f5f5441ad40eb99fec1f8c9e6c67d7
      https://github.com/phpmyadmin/phpmyadmin/commit/6991720ea2f5f5441ad40eb99fec1f8c9e6c67d7
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M ChangeLog
    M js/rte.js
    M libraries/sql.lib.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin


  Commit: 52e0087b0e25cc07857ef1dc1ce70c79e9492ccf
      https://github.com/phpmyadmin/phpmyadmin/commit/52e0087b0e25cc07857ef1dc1ce70c79e9492ccf
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M import.php
    M libraries/common.inc.php
    M setup/lib/index.lib.php

  Log Message:
  -----------
  Long messages wrapped

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 8c7e1a0b2ca336cc16cfcf7383d413c0766c4c49
      https://github.com/phpmyadmin/phpmyadmin/commit/8c7e1a0b2ca336cc16cfcf7383d413c0766c4c49
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M libraries/Console.class.php
    M libraries/display_create_table.lib.php

  Log Message:
  -----------
  Long lines wrapped

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: b94026494668af93d4f59117f87777dc0e031bfb
      https://github.com/phpmyadmin/phpmyadmin/commit/b94026494668af93d4f59117f87777dc0e031bfb
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M libraries/db_designer.lib.php

  Log Message:
  -----------
  Multi byte functions are not needed to match types

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 3c692738299eb10d175603bc7b8d0b0ff0e473c6
      https://github.com/phpmyadmin/phpmyadmin/commit/3c692738299eb10d175603bc7b8d0b0ff0e473c6
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M libraries/display_import.lib.php

  Log Message:
  -----------
  Wrap long js lines

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: b6f0d923b2303137723c916c8fceee225c00d55d
      https://github.com/phpmyadmin/phpmyadmin/commit/b6f0d923b2303137723c916c8fceee225c00d55d
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/import/ImportSql.class.php

  Log Message:
  -----------
  More long lines

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: ac450e7853347d8e370260e883f74786c195941f
      https://github.com/phpmyadmin/phpmyadmin/commit/ac450e7853347d8e370260e883f74786c195941f
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M libraries/plugins/schema/eps/RelationStatsEps.class.php
    M libraries/pmd_common.php
    M libraries/rte/rte_footer.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/tbl_relation.lib.php
    M test/classes/PMA_Table_test.php
    M test/classes/dbi/DBIDrizzle_test.php
    M test/classes/dbi/DBIMysqli_test.php
    M test/classes/plugin/export/PMA_ExportMediawiki_test.php
    M test/classes/plugin/import/ImportLdi_test.php
    M test/libraries/PMA_mult_submits_test.php
    M test/libraries/PMA_mysql_charsets_test.php
    M test/libraries/PMA_server_replication_test.php
    M test/libraries/PMA_server_status_queries_test.php
    M test/libraries/PMA_tbl_indexes_test.php
    M test/libraries/PMA_tbl_printview_test.php
    M test/libraries/PMA_tbl_tracking_test.php
    M test/libraries/PMA_user_preferences_test.php
    M test/libraries/rte/PMA_RTN_getDataFromRequest_test.php

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


  Commit: 4657979741b90d173548b10966347c885ef2e19f
      https://github.com/phpmyadmin/phpmyadmin/commit/4657979741b90d173548b10966347c885ef2e19f
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M po/si.po

  Log Message:
  -----------
  Translated using Weblate (Sinhala)

Currently translated at 67.5% (2009 of 2976 strings)

[CI skip]


  Commit: 661744c2b3e38075e226cc96dae221d42d144358
      https://github.com/phpmyadmin/phpmyadmin/commit/661744c2b3e38075e226cc96dae221d42d144358
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M import.php
    M libraries/Console.class.php
    M libraries/common.inc.php
    M libraries/db_designer.lib.php
    M libraries/display_create_table.lib.php
    M libraries/display_import.lib.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/import/ImportSql.class.php
    M setup/lib/index.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: e83c2f37f011d99c2938318305d757a0b4dad898
      https://github.com/phpmyadmin/phpmyadmin/commit/e83c2f37f011d99c2938318305d757a0b4dad898
  Author: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Removed unused codes

Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck at gmail.com>


  Commit: 55be4c8f8516720bd8c470c8e148a1f09c7cf649
      https://github.com/phpmyadmin/phpmyadmin/commit/55be4c8f8516720bd8c470c8e148a1f09c7cf649
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_general.lib.php
    M libraries/rte/rte_triggers.lib.php

  Log Message:
  -----------
  Remove duplicate code

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 6e2b7d9145eb65fdb52ed4e3dd3fd90602b03e51
      https://github.com/phpmyadmin/phpmyadmin/commit/6e2b7d9145eb65fdb52ed4e3dd3fd90602b03e51
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M libraries/DisplayResults.class.php
    M po/si.po

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


  Commit: 01c514e060638dfd4a428f6614f1353b7c2fb962
      https://github.com/phpmyadmin/phpmyadmin/commit/01c514e060638dfd4a428f6614f1353b7c2fb962
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M libraries/replication.inc.php

  Log Message:
  -----------
  Manage empty values of slave replication.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 8280bb0f9e70ba15508cd67ee4716c99c0d56b74
      https://github.com/phpmyadmin/phpmyadmin/commit/8280bb0f9e70ba15508cd67ee4716c99c0d56b74
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M libraries/replication.inc.php

  Log Message:
  -----------
  Manage empty values of slave replication.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: f8d68e62727edff403a46e04ddfa5d6923659884
      https://github.com/phpmyadmin/phpmyadmin/commit/f8d68e62727edff403a46e04ddfa5d6923659884
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M db_datadict.php
    M libraries/Util.class.php
    M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php

  Log Message:
  -----------
  Eliminate duplicate code

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 829a84b46e101cc5caa3a4252ea6f4453c49528d
      https://github.com/phpmyadmin/phpmyadmin/commit/829a84b46e101cc5caa3a4252ea6f4453c49528d
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M libraries/replication.inc.php

  Log Message:
  -----------
  Refactor replication_info filling.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 4ccb8df7ea2e8f786c7592e12f994c29bfb5b5c8
      https://github.com/phpmyadmin/phpmyadmin/commit/4ccb8df7ea2e8f786c7592e12f994c29bfb5b5c8
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M js/rte.js

  Log Message:
  -----------
  Merge pull request #1394 from nisargjhaveri/autocomplete

SQL autocomplete in RTE editors


  Commit: ed579ab84f909e7b060af9e7e3c18a46961a59ff
      https://github.com/phpmyadmin/phpmyadmin/commit/ed579ab84f909e7b060af9e7e3c18a46961a59ff
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M db_central_columns.php

  Log Message:
  -----------
  Improve message

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 9c0f01210da5f59ccec641fe1de5a06cdea31475
      https://github.com/phpmyadmin/phpmyadmin/commit/9c0f01210da5f59ccec641fe1de5a06cdea31475
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M libraries/replication.inc.php

  Log Message:
  -----------
  Merge pull request #1396 from Tithugues/b4535_master

Fix #4535: notices about replication


  Commit: 252f585281ec6242f880a65cad4de334b3836c64
      https://github.com/phpmyadmin/phpmyadmin/commit/252f585281ec6242f880a65cad4de334b3836c64
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update ChangeLog.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 3522eaa76e570b7442c8eca1f8130cd3dd08a8e9
      https://github.com/phpmyadmin/phpmyadmin/commit/3522eaa76e570b7442c8eca1f8130cd3dd08a8e9
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-11 (Tue, 11 Nov 2014)

  Changed paths:
    M export.php

  Log Message:
  -----------
  Directly use a POST parameter

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: ff5e32553ed3667be236163445693fc604a88ac9
      https://github.com/phpmyadmin/phpmyadmin/commit/ff5e32553ed3667be236163445693fc604a88ac9
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M import.php

  Log Message:
  -----------
  Executing multiple SQLs - add missing parameter

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: d533e981768769dac3434734164c91fc080e648a
      https://github.com/phpmyadmin/phpmyadmin/commit/d533e981768769dac3434734164c91fc080e648a
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M js/menu-resizer.js
    M libraries/structure.lib.php

  Log Message:
  -----------
  Fix bug#4586 Javascript error after moving a column

Signed-off-by: Atul Pratap Singh <atulpratapsingh05 at gmail.com>


  Commit: d2690886e57ce85d09a2d031699c987dd73b2383
      https://github.com/phpmyadmin/phpmyadmin/commit/d2690886e57ce85d09a2d031699c987dd73b2383
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Log Message:
  -----------
  Merge branch 'QA_4_2'


  Commit: 41df743274abc169b501cd33e6c266f99ff8c65f
      https://github.com/phpmyadmin/phpmyadmin/commit/41df743274abc169b501cd33e6c266f99ff8c65f
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Log Message:
  -----------
  Merge branch 'QA_4_2'


  Commit: 871d811bc7b1e3da2fd7a18b5caf16ab160975cb
      https://github.com/phpmyadmin/phpmyadmin/commit/871d811bc7b1e3da2fd7a18b5caf16ab160975cb
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for bug #4585 commit ff5e32553ed3667be

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: a42b441b6e02a140fb4fb297ae19d529eaa2db57
      https://github.com/phpmyadmin/phpmyadmin/commit/a42b441b6e02a140fb4fb297ae19d529eaa2db57
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M ChangeLog
    M db_central_columns.php
    M export.php
    M js/menu-resizer.js
    M js/rte.js
    M libraries/replication.inc.php
    M libraries/structure.lib.php

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 70a021a210544e024e5e6dbadc4e343b00ab2431
      https://github.com/phpmyadmin/phpmyadmin/commit/70a021a210544e024e5e6dbadc4e343b00ab2431
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M libraries/sqlparser.lib.php

  Log Message:
  -----------
  Avoid notices

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: c7a563893b569a20b95463d73146ea08e5c4ea53
      https://github.com/phpmyadmin/phpmyadmin/commit/c7a563893b569a20b95463d73146ea08e5c4ea53
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M libraries/replication.inc.php

  Log Message:
  -----------
  These two should be $server_slave_replication

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: c4710c3e1d20c95b6cf5081d02ac50eda86d2538
      https://github.com/phpmyadmin/phpmyadmin/commit/c4710c3e1d20c95b6cf5081d02ac50eda86d2538
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M libraries/build_html_for_db.lib.php

  Log Message:
  -----------
  Avoid notices related to replication

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: f031099ad6eb66e6ac7cb90ad3ef0a7d78422b50
      https://github.com/phpmyadmin/phpmyadmin/commit/f031099ad6eb66e6ac7cb90ad3ef0a7d78422b50
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M tbl_find_replace.php

  Log Message:
  -----------
  Update to new PMA_URL_getCommon parameters

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: e7296971f001cf4a5421e870d1ae67ab3c8bff40
      https://github.com/phpmyadmin/phpmyadmin/commit/e7296971f001cf4a5421e870d1ae67ab3c8bff40
  Author: Josh Kalderimis <josh.kalderimis at gmail.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Use the new beta build env on Travis

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 42466067984c2d0ac088061675a0a71b94041153
      https://github.com/phpmyadmin/phpmyadmin/commit/42466067984c2d0ac088061675a0a71b94041153
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M js/sql.js
    M js/tbl_structure.js

  Log Message:
  -----------
  Fix typo

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 410e9d35aac7fdc3c016e543e210f207801ec0f6
      https://github.com/phpmyadmin/phpmyadmin/commit/410e9d35aac7fdc3c016e543e210f207801ec0f6
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M js/common.js

  Log Message:
  -----------
  Bug #4588 Moving, renaming, dropping actions in table operations page results in token mismatch

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 5eec42792191dd17d4291f28945ea82b76e29bc6
      https://github.com/phpmyadmin/phpmyadmin/commit/5eec42792191dd17d4291f28945ea82b76e29bc6
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M libraries/navigation/NavigationHeader.class.php

  Log Message:
  -----------
  Avoid double question marks here

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: acdb9dc52e9433f851a31e5c501d2bb4a9cb6438
      https://github.com/phpmyadmin/phpmyadmin/commit/acdb9dc52e9433f851a31e5c501d2bb4a9cb6438
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M libraries/build_html_for_db.lib.php

  Log Message:
  -----------
  Another instance of double question marks

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 1a8d7055504f71cb0d9f5dd82df7f977fabd7dc7
      https://github.com/phpmyadmin/phpmyadmin/commit/1a8d7055504f71cb0d9f5dd82df7f977fabd7dc7
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M libraries/server_users.lib.php

  Log Message:
  -----------
  Another instance of double question marks

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 52596698a722e1732371a3be7dfdeaf8fa2c5d4f
      https://github.com/phpmyadmin/phpmyadmin/commit/52596698a722e1732371a3be7dfdeaf8fa2c5d4f
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M js/messages.php
    M js/sql.js
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Prompt to confirm on Show All

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 183aae0c3f0b9a5736083bb7972afd4efcf4efc2
      https://github.com/phpmyadmin/phpmyadmin/commit/183aae0c3f0b9a5736083bb7972afd4efcf4efc2
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M ChangeLog
    M js/sql.js
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  rfe #1556 Disabling Show all

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: e1a1ccf0607eb6d8570566002cb77b4847578993
      https://github.com/phpmyadmin/phpmyadmin/commit/e1a1ccf0607eb6d8570566002cb77b4847578993
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M libraries/select_lang.lib.php
    A po/vi.po

  Log Message:
  -----------
  Add Vietnamese language

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 61c208ff4da5c0f39c04ebc04128bec29a3d2cf2
      https://github.com/phpmyadmin/phpmyadmin/commit/61c208ff4da5c0f39c04ebc04128bec29a3d2cf2
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M po/vi.po

  Log Message:
  -----------
  Translated using Weblate (Vietnamese)

Currently translated at 0.0% (1 of 2976 strings)

[CI skip]


  Commit: 3e1455a5db6c184830b09ebf0b100447b97794d8
      https://github.com/phpmyadmin/phpmyadmin/commit/3e1455a5db6c184830b09ebf0b100447b97794d8
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M test/classes/PMA_DisplayResults_test.php

  Log Message:
  -----------
  Fix failing tests

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 11e97201320e61cdd380fc6a0080f09aa8238899
      https://github.com/phpmyadmin/phpmyadmin/commit/11e97201320e61cdd380fc6a0080f09aa8238899
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M libraries/navigation/NavigationTree.class.php

  Log Message:
  -----------
  Warn about large item groups in navigation

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 13c5a85d67956024803d3fdad7ef99e13c1ab2a7
      https://github.com/phpmyadmin/phpmyadmin/commit/13c5a85d67956024803d3fdad7ef99e13c1ab2a7
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M libraries/select_lang.lib.php
    A po/vi.po

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


  Commit: 6ba2e02f7feb2c5e4aa79248f7bd52ed7d82201b
      https://github.com/phpmyadmin/phpmyadmin/commit/6ba2e02f7feb2c5e4aa79248f7bd52ed7d82201b
  Author: Xuan Hung <mr.hungdx at gmail.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M po/vi.po

  Log Message:
  -----------
  Translated using Weblate (Vietnamese)

Currently translated at 1.3% (39 of 2976 strings)

[CI skip]


  Commit: e5b7eb9b9cc9858c11efa53b8963ff2cbc78f0d4
      https://github.com/phpmyadmin/phpmyadmin/commit/e5b7eb9b9cc9858c11efa53b8963ff2cbc78f0d4
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M libraries/navigation/NavigationTree.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: c59ead735053904c14cddf6574991f3de4cd7f10
      https://github.com/phpmyadmin/phpmyadmin/commit/c59ead735053904c14cddf6574991f3de4cd7f10
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M js/common.js

  Log Message:
  -----------
  Merge pull request #1398 from madhuracj/bug4588

Bug #4588 Moving, renaming, dropping actions in table operations page re...


  Commit: 9c82f7050a0e10308c980fb0eb1a9a738776af3b
      https://github.com/phpmyadmin/phpmyadmin/commit/9c82f7050a0e10308c980fb0eb1a9a738776af3b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M ChangeLog
    M js/messages.php
    M js/sql.js
    M libraries/DisplayResults.class.php
    M test/classes/PMA_DisplayResults_test.php

  Log Message:
  -----------
  Merge pull request #1400 from madhuracj/ShowAll1

rfe #1556 implemented with a checkbox for 'Show all'


  Commit: ec4ac4ec7310476af558a49e8f0fad82f3a6e164
      https://github.com/phpmyadmin/phpmyadmin/commit/ec4ac4ec7310476af558a49e8f0fad82f3a6e164
  Author: Martin Vidner <martin at vidner.net>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M po/cs.po

  Log Message:
  -----------
  Translated using Weblate (Czech)

Currently translated at 94.8% (2823 of 2976 strings)

[CI skip]


  Commit: e2cda595e456c98e0633cfe3a7a58bcac0ae9641
      https://github.com/phpmyadmin/phpmyadmin/commit/e2cda595e456c98e0633cfe3a7a58bcac0ae9641
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M ChangeLog
    M js/messages.php
    M js/sql.js
    M libraries/DisplayResults.class.php
    M test/classes/PMA_DisplayResults_test.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 1fc718babb666e3e429c4e1f84b0e8e16da2335b
      https://github.com/phpmyadmin/phpmyadmin/commit/1fc718babb666e3e429c4e1f84b0e8e16da2335b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M js/messages.php

  Log Message:
  -----------
  Improve message

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 3381c2148f7b0b4d6949c9248debeee968eccf69
      https://github.com/phpmyadmin/phpmyadmin/commit/3381c2148f7b0b4d6949c9248debeee968eccf69
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    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/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    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/vi.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po

  Log Message:
  -----------
  Update po files

[CI skip]

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 738af9af54e276e1fba2f1e60ce88d6b60f1017e
      https://github.com/phpmyadmin/phpmyadmin/commit/738af9af54e276e1fba2f1e60ce88d6b60f1017e
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

  Log Message:
  -----------
  Merge pull request #1393 from Tithugues/b4569_display_master

Fix display issue of #4569.


  Commit: 78d6c04c4ae5aaad465f4d269faa31174a1119fb
      https://github.com/phpmyadmin/phpmyadmin/commit/78d6c04c4ae5aaad465f4d269faa31174a1119fb
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M js/navigation.js
    M libraries/Footer.class.php

  Log Message:
  -----------
  Update errors on navigation panel actions

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 5e7503673dea6b1ee64989eac51c63752d385ea3
      https://github.com/phpmyadmin/phpmyadmin/commit/5e7503673dea6b1ee64989eac51c63752d385ea3
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M js/navigation.js

  Log Message:
  -----------
  Replace only if there are actually errors

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 6b34b9cb61b8eea7c326728be5a826ce5d89c2cd
      https://github.com/phpmyadmin/phpmyadmin/commit/6b34b9cb61b8eea7c326728be5a826ce5d89c2cd
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M libraries/rte/rte_footer.lib.php

  Log Message:
  -----------
  bug #4589 Can not add new procedures

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 7c0b1bafed21325394f883dc4411845917a12c78
      https://github.com/phpmyadmin/phpmyadmin/commit/7c0b1bafed21325394f883dc4411845917a12c78
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M libraries/core.lib.php

  Log Message:
  -----------
  Fix coding style error

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 79145b4e50bad96361e19462315a55232010600b
      https://github.com/phpmyadmin/phpmyadmin/commit/79145b4e50bad96361e19462315a55232010600b
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php

  Log Message:
  -----------
  $db is not defined

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 89158e98a7019199b01cac766181d917d85be9d3
      https://github.com/phpmyadmin/phpmyadmin/commit/89158e98a7019199b01cac766181d917d85be9d3
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M import.php

  Log Message:
  -----------
  Use request data directly for 'allow_interrupt'

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 867aff9c18e53b8f13f2d28976e80e1bbb32a858
      https://github.com/phpmyadmin/phpmyadmin/commit/867aff9c18e53b8f13f2d28976e80e1bbb32a858
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M libraries/plugin_interface.lib.php

  Log Message:
  -----------
  Simplify the logic

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 303dfd7fec09a17ba5a087b795b57919869f798b
      https://github.com/phpmyadmin/phpmyadmin/commit/303dfd7fec09a17ba5a087b795b57919869f798b
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M import.php

  Log Message:
  -----------
  User request params directly, 'action_bookimark'

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: f9248d3ee2c9864bc1057ea51062d76ae4119d47
      https://github.com/phpmyadmin/phpmyadmin/commit/f9248d3ee2c9864bc1057ea51062d76ae4119d47
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M import.php

  Log Message:
  -----------
  Use request params directly, 'id_bookmark'

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 83a4a2d896489be07dd6fdd7ade2d48f8556c5c6
      https://github.com/phpmyadmin/phpmyadmin/commit/83a4a2d896489be07dd6fdd7ade2d48f8556c5c6
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M import.php

  Log Message:
  -----------
  action_bookmark_all was never added to GLOBALS, use from REQUEST directly

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: fc340c3e87ff6f33b20126e6d7fae38552bd84bd
      https://github.com/phpmyadmin/phpmyadmin/commit/fc340c3e87ff6f33b20126e6d7fae38552bd84bd
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M import.php

  Log Message:
  -----------
  Use variable 'bookmark_variable' directly from REQUEST

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 8503a58f53ee5e0ba4983d5deba6a40405841c14
      https://github.com/phpmyadmin/phpmyadmin/commit/8503a58f53ee5e0ba4983d5deba6a40405841c14
  Author: Ziyaddin Sadigov <ziyaddinsadigov at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M po/az.po

  Log Message:
  -----------
  Translated using Weblate


  Commit: 6916c56fc2d1e5e53156fece386c377c3808aba3
      https://github.com/phpmyadmin/phpmyadmin/commit/6916c56fc2d1e5e53156fece386c377c3808aba3
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M po/az.po

  Log Message:
  -----------
  Merge remote-tracking branch 'weblate-master/master'

Conflicts:
	po/az.po


  Commit: b39f4c9afff861f2b478105a3835478c0a0d818f
      https://github.com/phpmyadmin/phpmyadmin/commit/b39f4c9afff861f2b478105a3835478c0a0d818f
  Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M po/nl.po

  Log Message:
  -----------
  Translated using Weblate (Dutch)

Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]


  Commit: 2ac5eae23af0784edb8806a8d5f6bd7bc7fd65fe
      https://github.com/phpmyadmin/phpmyadmin/commit/2ac5eae23af0784edb8806a8d5f6bd7bc7fd65fe
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M po/fr.po

  Log Message:
  -----------
  Translated using Weblate (French)

Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]


  Commit: 375953e48b0a5d90cca7c04deedbc3704ca70140
      https://github.com/phpmyadmin/phpmyadmin/commit/375953e48b0a5d90cca7c04deedbc3704ca70140
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M po/et.po

  Log Message:
  -----------
  Translated using Weblate (Estonian)

Currently translated at 99.9% (2976 of 2978 strings)

[CI skip]


  Commit: 53c67dafecfa2b930fbe2b642e3e7debdbc86d15
      https://github.com/phpmyadmin/phpmyadmin/commit/53c67dafecfa2b930fbe2b642e3e7debdbc86d15
  Author: Kristjan Räts <kristjanrats at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M po/et.po

  Log Message:
  -----------
  Translated using Weblate (Estonian)

Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]


  Commit: 3d038ced197d5f1849d0412f2928f9d69ff8af66
      https://github.com/phpmyadmin/phpmyadmin/commit/3d038ced197d5f1849d0412f2928f9d69ff8af66
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.3.0-alpha1

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: babad6efe515e62053d9af96b2a634a29ff2c943
      https://github.com/phpmyadmin/phpmyadmin/commit/babad6efe515e62053d9af96b2a634a29ff2c943
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Fix merge conflicts

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: b86853e50fbeac6a88905d851f30b027d5d4d5ef
      https://github.com/phpmyadmin/phpmyadmin/commit/b86853e50fbeac6a88905d851f30b027d5d4d5ef
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M po/hy.po

  Log Message:
  -----------
  Translated using Weblate (Armenian)

Currently translated at 3.3% (100 of 2978 strings)

[CI skip]


  Commit: 9423d7bf68e50ac4616fc8d2173569b0a2dc18df
      https://github.com/phpmyadmin/phpmyadmin/commit/9423d7bf68e50ac4616fc8d2173569b0a2dc18df
  Author: Panagiotis Papazoglou <papaz_p at yahoo.com>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M po/el.po

  Log Message:
  -----------
  Translated using Weblate (Greek)

Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]


  Commit: 931a6458e15ffe2dabd58a437d65d3f001543502
      https://github.com/phpmyadmin/phpmyadmin/commit/931a6458e15ffe2dabd58a437d65d3f001543502
  Author: Andika Triwidada <andika at gmail.com>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M po/id.po

  Log Message:
  -----------
  Translated using Weblate (Indonesian)

Currently translated at 74.2% (2210 of 2978 strings)

[CI skip]


  Commit: 7509725b75617518d975dc41016d75f1f4561272
      https://github.com/phpmyadmin/phpmyadmin/commit/7509725b75617518d975dc41016d75f1f4561272
  Author: Giovanni Sora <g.sora at tiscali.it>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M po/ia.po

  Log Message:
  -----------
  Translated using Weblate (Interlingua)

Currently translated at 63.7% (1897 of 2978 strings)

[CI skip]


  Commit: b5466eaa815eb0f4f53d596ffdfdf2b84361840f
      https://github.com/phpmyadmin/phpmyadmin/commit/b5466eaa815eb0f4f53d596ffdfdf2b84361840f
  Author: youngminz <youngminz.kr at gmail.com>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M po/ko.po

  Log Message:
  -----------
  Translated using Weblate (Korean)

Currently translated at 82.1% (2446 of 2978 strings)

[CI skip]


  Commit: c5a40b576753354247ddd6abab8bf18a114750e8
      https://github.com/phpmyadmin/phpmyadmin/commit/c5a40b576753354247ddd6abab8bf18a114750e8
  Author: Burak Yavuz <hitowerdigit at hotmail.com>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M po/tr.po

  Log Message:
  -----------
  Translated using Weblate (Turkish)

Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]


  Commit: 1a4be1f31041423dfa7d5d61bf335ba00467b3bc
      https://github.com/phpmyadmin/phpmyadmin/commit/1a4be1f31041423dfa7d5d61bf335ba00467b3bc
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M po/uz.po

  Log Message:
  -----------
  Translated using Weblate (Uzbek)

Currently translated at 37.4% (1114 of 2978 strings)

[CI skip]


  Commit: baa9545808a0cf5e1ca50d2790cb6ab394c5003a
      https://github.com/phpmyadmin/phpmyadmin/commit/baa9545808a0cf5e1ca50d2790cb6ab394c5003a
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M po/cy.po

  Log Message:
  -----------
  Translated using Weblate (Welsh)

Currently translated at 20.1% (599 of 2978 strings)

[CI skip]


  Commit: 9838e780e8085598be0bd66e49bf3816e4323641
      https://github.com/phpmyadmin/phpmyadmin/commit/9838e780e8085598be0bd66e49bf3816e4323641
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3


  Commit: 8502efb8cf8f139ef3421b467d0bd1a69d6f6e5b
      https://github.com/phpmyadmin/phpmyadmin/commit/8502efb8cf8f139ef3421b467d0bd1a69d6f6e5b
  Author: Mircəlal <01youknowme at gmail.com>
  Date:   2014-11-16 (Sun, 16 Nov 2014)

  Changed paths:
    M po/az.po

  Log Message:
  -----------
  Translated using Weblate (Azerbaijani)

Currently translated at 47.9% (1429 of 2978 strings)

[CI skip]


  Commit: b7108e9e70ae8b6f82061864e8a82ed74575b663
      https://github.com/phpmyadmin/phpmyadmin/commit/b7108e9e70ae8b6f82061864e8a82ed74575b663
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    M libraries/TableSearch.class.php

  Log Message:
  -----------
  Bug #4600 Warning when editing the results of a Search

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 8269287109759d17637137235a0939894b3eda97
      https://github.com/phpmyadmin/phpmyadmin/commit/8269287109759d17637137235a0939894b3eda97
  Author: Sevdimali İsa <sevdimaliisayev at mail.ru>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    M po/az.po

  Log Message:
  -----------
  Translated using Weblate (Azerbaijani)

Currently translated at 48.2% (1436 of 2978 strings)

[CI skip]


  Commit: 687e78d2cc9ec08a50bf79ef00232136cfd516bf
      https://github.com/phpmyadmin/phpmyadmin/commit/687e78d2cc9ec08a50bf79ef00232136cfd516bf
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-17 (Mon, 17 Nov 2014)

  Changed paths:
    M libraries/TableSearch.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3


  Commit: b802b5f9b3df79ae10f06e1491d287893a5519fc
      https://github.com/phpmyadmin/phpmyadmin/commit/b802b5f9b3df79ae10f06e1491d287893a5519fc
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-18 (Tue, 18 Nov 2014)

  Changed paths:
    M js/navigation.js

  Log Message:
  -----------
  Bug #4591 Spinner in navigation running forever

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 7413983602d793404c4577e450d6cc63a37171d0
      https://github.com/phpmyadmin/phpmyadmin/commit/7413983602d793404c4577e450d6cc63a37171d0
  Author: Sevdimali İsa <sevdimaliisayev at mail.ru>
  Date:   2014-11-18 (Tue, 18 Nov 2014)

  Changed paths:
    M po/az.po

  Log Message:
  -----------
  Translated using Weblate (Azerbaijani)

Currently translated at 49.2% (1467 of 2978 strings)

[CI skip]


  Commit: 54f1bc5d2c99bc1dded6b4f6d4f7d7a2aa086c79
      https://github.com/phpmyadmin/phpmyadmin/commit/54f1bc5d2c99bc1dded6b4f6d4f7d7a2aa086c79
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-18 (Tue, 18 Nov 2014)

  Changed paths:
    M js/navigation.js

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3


  Commit: ea5333e5230eb054929edd66e0f313388861ee46
      https://github.com/phpmyadmin/phpmyadmin/commit/ea5333e5230eb054929edd66e0f313388861ee46
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-18 (Tue, 18 Nov 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entries for bugs related to performance with thousands of databases

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 19e5ddffcc4681f812bd35fdaea8790d76b453bb
      https://github.com/phpmyadmin/phpmyadmin/commit/19e5ddffcc4681f812bd35fdaea8790d76b453bb
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-18 (Tue, 18 Nov 2014)

  Changed paths:
    M po/az.po

  Log Message:
  -----------
  Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3


  Commit: aa41a0bb0e5a9fb23362b852998937eef3ef9946
      https://github.com/phpmyadmin/phpmyadmin/commit/aa41a0bb0e5a9fb23362b852998937eef3ef9946
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/operations.lib.php

  Log Message:
  -----------
  Merge branch 'QA_4_2' into QA_4_3


  Commit: 4630dd22d5022a17610750f2201c8c74c927adb3
      https://github.com/phpmyadmin/phpmyadmin/commit/4630dd22d5022a17610750f2201c8c74c927adb3
  Author: Sevdimali İsa <sevdimaliisayev at mail.ru>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M po/az.po

  Log Message:
  -----------
  Translated using Weblate (Azerbaijani)

Currently translated at 50.6% (1507 of 2978 strings)

[CI skip]


  Commit: b29a021ffcf051c3b1a4c6bc3588678cf40c83a4
      https://github.com/phpmyadmin/phpmyadmin/commit/b29a021ffcf051c3b1a4c6bc3588678cf40c83a4
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/operations.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3


  Commit: 0b662922dbf258ca25f6341a89f739f33439c006
      https://github.com/phpmyadmin/phpmyadmin/commit/0b662922dbf258ca25f6341a89f739f33439c006
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/display_export.lib.php

  Log Message:
  -----------
  Merge branch 'QA_4_2' into QA_4_3

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 3cda6ac366aaea7d7710ea074c631f59bb983acd
      https://github.com/phpmyadmin/phpmyadmin/commit/3cda6ac366aaea7d7710ea074c631f59bb983acd
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M po/az.po

  Log Message:
  -----------
  Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3


  Commit: 837f5f46d5f7b30d5c425e5d9eab707a851139af
      https://github.com/phpmyadmin/phpmyadmin/commit/837f5f46d5f7b30d5c425e5d9eab707a851139af
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ChangeLog
    M tbl_export.php

  Log Message:
  -----------
  Merge branch 'QA_4_2' into QA_4_3


  Commit: 491c426623ff8a4f3f99078801412ed155cb168a
      https://github.com/phpmyadmin/phpmyadmin/commit/491c426623ff8a4f3f99078801412ed155cb168a
  Author: Robert Scheck <robert at fedoraproject.org>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  Patch by Robert Scheck <robert at fedoraproject.org> for phpMyAdmin 4.2.6
which enhances cookie encryption/decryption by the optional usage of
PHP OpenSSL. Unfortunately PHP Mcrypt is not shipped by all Linux
distributions however PHP OpenSSL is often enabled by default.
PHP < 5.3.4 does not support passing an IV, thus this has been added as
a requirement. I could have used 'BF-CBC' rather 'AES-128-CBC' but Blowfish
(even it is fast) is seen by experts as weaker algorithm than
AES. If this should be a show-stopper for upstream merging just replace
'AES-128-CBC' by 'BF-CBC', please.

Patch adapted for 4.3.x and tests modified by Marc Delisle

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: d3fb6617f513fb97d4cc860863692072b5f8a1fd
      https://github.com/phpmyadmin/phpmyadmin/commit/d3fb6617f513fb97d4cc860863692072b5f8a1fd
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/display_export.lib.php
    M libraries/operations.lib.php
    M po/az.po
    M tbl_export.php

  Log Message:
  -----------
  Merge branch 'QA_4_3' of https://github.com/phpmyadmin/phpmyadmin into QA_4_3


  Commit: d067ae7dd5f4cf58597f4a5182c0f7fa6a1cb0f5
      https://github.com/phpmyadmin/phpmyadmin/commit/d067ae7dd5f4cf58597f4a5182c0f7fa6a1cb0f5
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: a0b60e090180cf3dd6fd0d47b77aa0127b3c1434
      https://github.com/phpmyadmin/phpmyadmin/commit/a0b60e090180cf3dd6fd0d47b77aa0127b3c1434
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/relation.lib.php
    M libraries/tbl_columns_definition_form.inc.php

  Log Message:
  -----------
  Merge branch 'QA_4_2' into QA_4_3

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 5e1b5e086fe7abc3a318056fffd7553b2bf2da0c
      https://github.com/phpmyadmin/phpmyadmin/commit/5e1b5e086fe7abc3a318056fffd7553b2bf2da0c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M js/tbl_structure.js

  Log Message:
  -----------
  Keep the content of the table structure page until editing page is loaded

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 566466e32b8ff4e36efbaf55cd9513758fd59fa2
      https://github.com/phpmyadmin/phpmyadmin/commit/566466e32b8ff4e36efbaf55cd9513758fd59fa2
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M js/tbl_structure.js

  Log Message:
  -----------
  Eliminate duplicate code

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 4d151b6e89d8db71a1f97c5a9071deb36b03cdd1
      https://github.com/phpmyadmin/phpmyadmin/commit/4d151b6e89d8db71a1f97c5a9071deb36b03cdd1
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M libraries/relation.lib.php

  Log Message:
  -----------
  Fix encoding of relation.lib.php

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 5f1a5a78bcfc144c059df2c79854881d2d04c2cb
      https://github.com/phpmyadmin/phpmyadmin/commit/5f1a5a78bcfc144c059df2c79854881d2d04c2cb
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  Shared check for OpenSSL support

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 8fc377d83aa4f541e5f8a4ffcd056d5f11e2b2e2
      https://github.com/phpmyadmin/phpmyadmin/commit/8fc377d83aa4f541e5f8a4ffcd056d5f11e2b2e2
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  Share code for resetting IV size

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: c11efb678d5abc3061279f2c743d2a58825aedde
      https://github.com/phpmyadmin/phpmyadmin/commit/c11efb678d5abc3061279f2c743d2a58825aedde
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  This is binary string, can not use mb_strlen

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 5c6d1c9423e341636d08b7a121e8b0be7af5f2e0
      https://github.com/phpmyadmin/phpmyadmin/commit/5c6d1c9423e341636d08b7a121e8b0be7af5f2e0
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M po/cy.po

  Log Message:
  -----------
  Fix plural equation

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 2ac39b23909ca339484cfe5cec8ab32bb19a2a15
      https://github.com/phpmyadmin/phpmyadmin/commit/2ac39b23909ca339484cfe5cec8ab32bb19a2a15
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M po/cy.po

  Log Message:
  -----------
  Another typo in plural form

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 5ac08bde49284c1e34ed1fa1ddb0e15abb676306
      https://github.com/phpmyadmin/phpmyadmin/commit/5ac08bde49284c1e34ed1fa1ddb0e15abb676306
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.3.0-beta1

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: ce8c5361455423dca2debc2e9fc98507c54152bc
      https://github.com/phpmyadmin/phpmyadmin/commit/ce8c5361455423dca2debc2e9fc98507c54152bc
  Author: Sandro Amaral <sandro123iv at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M po/pt.po

  Log Message:
  -----------
  Translated using Weblate (Portuguese)

Currently translated at 60.9% (1816 of 2978 strings)

[CI skip]


  Commit: c7d9a99683810144822c66f463b470eff64df956
      https://github.com/phpmyadmin/phpmyadmin/commit/c7d9a99683810144822c66f463b470eff64df956
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3


  Commit: 93366c8c2403a1dc07d9b198a423d250ffb7ecd2
      https://github.com/phpmyadmin/phpmyadmin/commit/93366c8c2403a1dc07d9b198a423d250ffb7ecd2
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/Config.class.php
    M libraries/Theme.class.php
    M libraries/error_report.lib.php
    M libraries/gis/GIS_Factory.class.php
    M libraries/mult_submits.lib.php
    M libraries/tbl_printview.lib.php
    M tbl_zoom_select.php

  Log Message:
  -----------
  Merge branch 'QA_4_2' into QA_4_3

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 791243700f3963587fc4c4c248f4e6536109754c
      https://github.com/phpmyadmin/phpmyadmin/commit/791243700f3963587fc4c4c248f4e6536109754c
  Author: Sandro Amaral <sandro123iv at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M po/pt.po

  Log Message:
  -----------
  Translated using Weblate (Portuguese)

Currently translated at 61.0% (1819 of 2978 strings)

[CI skip]


  Commit: 23d65f688978b36573845a39d7f6e5dd3a419187
      https://github.com/phpmyadmin/phpmyadmin/commit/23d65f688978b36573845a39d7f6e5dd3a419187
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/Config.class.php
    M libraries/Theme.class.php
    M libraries/error_report.lib.php
    M libraries/gis/GIS_Factory.class.php
    M libraries/mult_submits.lib.php
    M libraries/tbl_printview.lib.php
    M tbl_zoom_select.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3


  Commit: c2cf281dd65aa97fb6aac7f16bc995636d25b973
      https://github.com/phpmyadmin/phpmyadmin/commit/c2cf281dd65aa97fb6aac7f16bc995636d25b973
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M libraries/gis/GIS_Factory.class.php

  Log Message:
  -----------
  Fix merge errors. MB functions are not required to handle geometry type names

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 0ca9f5f2c8f644a11c75ce32db510814f0903b3d
      https://github.com/phpmyadmin/phpmyadmin/commit/0ca9f5f2c8f644a11c75ce32db510814f0903b3d
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M po/pt.po

  Log Message:
  -----------
  Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3


  Commit: 89515a0aa32bd35b48ab616810daee015d2a6c84
      https://github.com/phpmyadmin/phpmyadmin/commit/89515a0aa32bd35b48ab616810daee015d2a6c84
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  4.2.13-dev in ChangeLog

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 3810111659089fca465a54d2cb1eab4400c739a8
      https://github.com/phpmyadmin/phpmyadmin/commit/3810111659089fca465a54d2cb1eab4400c739a8
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M libraries/tracking.lib.php

  Log Message:
  -----------
  Incorrect offset in tracking report

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 11b1dd67fb2ff5c243ca25b0526fb32bac9e91b4
      https://github.com/phpmyadmin/phpmyadmin/commit/11b1dd67fb2ff5c243ca25b0526fb32bac9e91b4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/relation.lib.php

  Log Message:
  -----------
  Merge branch 'QA_4_2' into QA_4_3


  Commit: 4bade1edfd4de01c0b1570ba694bfec11aba45f8
      https://github.com/phpmyadmin/phpmyadmin/commit/4bade1edfd4de01c0b1570ba694bfec11aba45f8
  Author: Sevdimali İsa <sevdimaliisayev at mail.ru>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Changed paths:
    M po/az.po

  Log Message:
  -----------
  Translated using Weblate (Azerbaijani)

Currently translated at 51.6% (1537 of 2978 strings)

[CI skip]


  Commit: 42bf15ea7010e6443a3ffa3cb81fe2f355b05130
      https://github.com/phpmyadmin/phpmyadmin/commit/42bf15ea7010e6443a3ffa3cb81fe2f355b05130
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/relation.lib.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3


  Commit: 9af3635c2627b071bd84145e3f0639a432ca7711
      https://github.com/phpmyadmin/phpmyadmin/commit/9af3635c2627b071bd84145e3f0639a432ca7711
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Changed paths:
    M ChangeLog
    M index.php

  Log Message:
  -----------
  Fix merge conflicts

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 0489e3248dde1fba7d14d2c9121e7bce6d99c0d9
      https://github.com/phpmyadmin/phpmyadmin/commit/0489e3248dde1fba7d14d2c9121e7bce6d99c0d9
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Log Message:
  -----------
  Merge commit '783e28f' into QA_4_3


  Commit: ed6ba4210f3de49b7d49d09a84d8f964d2b42701
      https://github.com/phpmyadmin/phpmyadmin/commit/ed6ba4210f3de49b7d49d09a84d8f964d2b42701
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-22 (Sat, 22 Nov 2014)

  Changed paths:
    M index.php

  Log Message:
  -----------
  Fix merge conflict

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: aad6456b45719d10fb37266a975d9ac695281169
      https://github.com/phpmyadmin/phpmyadmin/commit/aad6456b45719d10fb37266a975d9ac695281169
  Author: Sevdimali İsa <sevdimaliisayev at mail.ru>
  Date:   2014-11-24 (Mon, 24 Nov 2014)

  Changed paths:
    M po/az.po

  Log Message:
  -----------
  Translated using Weblate (Azerbaijani)

Currently translated at 53.0% (1581 of 2978 strings)

[CI skip]


  Commit: 0fda8293f44de2fe26beef78c14790d2ca230052
      https://github.com/phpmyadmin/phpmyadmin/commit/0fda8293f44de2fe26beef78c14790d2ca230052
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/tracking.lib.php
    M tbl_tracking.php

  Log Message:
  -----------
  Merge branch 'QA_4_2' into QA_4_3


  Commit: 762dd0884ffebd4da5e2fee1ea187fb5980a53ef
      https://github.com/phpmyadmin/phpmyadmin/commit/762dd0884ffebd4da5e2fee1ea187fb5980a53ef
  Author: Huseyn <huseyn_esgerov at mail.ru>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M po/az.po

  Log Message:
  -----------
  Translated using Weblate (Azerbaijani)

Currently translated at 53.1% (1582 of 2978 strings)

[CI skip]


  Commit: e2a9605706ea8edd78d37ece7fe19924e45f20f2
      https://github.com/phpmyadmin/phpmyadmin/commit/e2a9605706ea8edd78d37ece7fe19924e45f20f2
  Author: Weblate <noreply at weblate.org>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/tracking.lib.php
    M tbl_tracking.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3


  Commit: 57413772c1e4af8673edfd6ce82b31187382785d
      https://github.com/phpmyadmin/phpmyadmin/commit/57413772c1e4af8673edfd6ce82b31187382785d
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-25 (Tue, 25 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/tbl_common.inc.php
    M libraries/tracking.lib.php

  Log Message:
  -----------
  Merge branch 'QA_4_2' into QA_4_3

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: f5c263119de849d229c00b576b521d5153624cf6
      https://github.com/phpmyadmin/phpmyadmin/commit/f5c263119de849d229c00b576b521d5153624cf6
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-11-26 (Wed, 26 Nov 2014)

  Changed paths:
    M ChangeLog
    M db_operations.php

  Log Message:
  -----------
  Merge branch 'QA_4_2' into QA_4_3

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: e38f5753ff0a6f9b6301710d226ea3ae3d6a4cfa
      https://github.com/phpmyadmin/phpmyadmin/commit/e38f5753ff0a6f9b6301710d226ea3ae3d6a4cfa
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-26 (Wed, 26 Nov 2014)

  Changed paths:
    M libraries/structure.lib.php

  Log Message:
  -----------
  Undefined index central_columnswork

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 0ab3ee372844c3d3b445daa323dff35199611346
      https://github.com/phpmyadmin/phpmyadmin/commit/0ab3ee372844c3d3b445daa323dff35199611346
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-27 (Thu, 27 Nov 2014)

  Changed paths:
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.3.0-rc1

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 942f366e71605bb423d786523ad086396cf62afb
      https://github.com/phpmyadmin/phpmyadmin/commit/942f366e71605bb423d786523ad086396cf62afb
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-30 (Sun, 30 Nov 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.2.13 release

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 41277d1887300298e007ae3151af9983a6a384af
      https://github.com/phpmyadmin/phpmyadmin/commit/41277d1887300298e007ae3151af9983a6a384af
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-30 (Sun, 30 Nov 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  4.2.13 release

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 1daa32fb97b90fd1bf233cae9ed249e37fa175c4
      https://github.com/phpmyadmin/phpmyadmin/commit/1daa32fb97b90fd1bf233cae9ed249e37fa175c4
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    M ChangeLog
    M url.php

  Log Message:
  -----------
  bug #4612 [security] XSS vulnerability in redirection mechanism

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: a4e8d008f407d92c7177bca799c54525ba9032ad
      https://github.com/phpmyadmin/phpmyadmin/commit/a4e8d008f407d92c7177bca799c54525ba9032ad
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    M ChangeLog
    M libraries/common.inc.php
    M libraries/plugins/AuthenticationPlugin.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php

  Log Message:
  -----------
  bug #4611 [security] DOS attack with long passwords

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 20d0f08c587288698d813e22bd7b8de85cfbb5a1
      https://github.com/phpmyadmin/phpmyadmin/commit/20d0f08c587288698d813e22bd7b8de85cfbb5a1
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  Deactivate this test for now

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: cc0c82e2a3b3806ac4df76e89a3d52e4bf8d004d
      https://github.com/phpmyadmin/phpmyadmin/commit/cc0c82e2a3b3806ac4df76e89a3d52e4bf8d004d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.3.0-rc2 release

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 94952f52dad9490b4260067b68183a6d8c893869
      https://github.com/phpmyadmin/phpmyadmin/commit/94952f52dad9490b4260067b68183a6d8c893869
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  Adjust testcase to new split methods

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: f2a4b56afe4291513434db2f7b5541774d13f48b
      https://github.com/phpmyadmin/phpmyadmin/commit/f2a4b56afe4291513434db2f7b5541774d13f48b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  Add missing call to test

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 4ac6b01e17c2e4a8183c0e5ae880b88959d1d85f
      https://github.com/phpmyadmin/phpmyadmin/commit/4ac6b01e17c2e4a8183c0e5ae880b88959d1d85f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php
    M libraries/common.inc.php
    M libraries/plugins/AuthenticationPlugin.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    M url.php

  Log Message:
  -----------
  Merge branch 'MAINT_4_2_13' into QA_4_2

Conflicts:
	ChangeLog
	README
	doc/conf.py
	libraries/Config.class.php


  Commit: f9dc6be7e64e4853129a77ad2b04a08f4ec6bd3d
      https://github.com/phpmyadmin/phpmyadmin/commit/f9dc6be7e64e4853129a77ad2b04a08f4ec6bd3d
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  Add missing call to test

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: ccc239040f7f222c6c71cde3eda316eceecff16c
      https://github.com/phpmyadmin/phpmyadmin/commit/ccc239040f7f222c6c71cde3eda316eceecff16c
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  Adjust testcase to new split methods

Signed-off-by: Michal Čihař <michal at cihar.com>

Conflicts:
	test/classes/plugin/auth/PMA_AuthenticationCookie_test.php


  Commit: 72d2741f37c27a3e73aa36827fe5f8e73d351c4b
      https://github.com/phpmyadmin/phpmyadmin/commit/72d2741f37c27a3e73aa36827fe5f8e73d351c4b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M po/hy.po

  Log Message:
  -----------
  Adjust plurals equation

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 88cd689346757daf2e65c3344a8bf3df359b1225
      https://github.com/phpmyadmin/phpmyadmin/commit/88cd689346757daf2e65c3344a8bf3df359b1225
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M po/hy.po

  Log Message:
  -----------
  Merge branch 'MAINT_4_2_13' into QA_4_2


  Commit: d7b0f0d4f9e0ac78a3a83aeee7cbf91c389d275d
      https://github.com/phpmyadmin/phpmyadmin/commit/d7b0f0d4f9e0ac78a3a83aeee7cbf91c389d275d
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M .travis.yml
    M build.xml
    M composer.json

  Log Message:
  -----------
  Install phpunit using composer

The pear channel is now disabled so our test fail.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 053cd7303131fa09c164b0ff84bb9bd59f087118
      https://github.com/phpmyadmin/phpmyadmin/commit/053cd7303131fa09c164b0ff84bb9bd59f087118
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M .travis.yml
    M build.xml
    M composer.json

  Log Message:
  -----------
  Merge branch 'MAINT_4_2_13' into QA_4_2


  Commit: f8ed8422e64dfa153aded6c782db15d9e0cb383b
      https://github.com/phpmyadmin/phpmyadmin/commit/f8ed8422e64dfa153aded6c782db15d9e0cb383b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M po/hy.po

  Log Message:
  -----------
  Revert "Adjust plurals equation"

This reverts commit 72d2741f37c27a3e73aa36827fe5f8e73d351c4b.


  Commit: 7a41a4f325264b04fd11e28f975e0199cb5e95d2
      https://github.com/phpmyadmin/phpmyadmin/commit/7a41a4f325264b04fd11e28f975e0199cb5e95d2
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M po/hy.po
    M po/uz.po

  Log Message:
  -----------
  Fix syntax errors in po files

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: c2ad99da2bf166de7e114e1e129ee435c9e23756
      https://github.com/phpmyadmin/phpmyadmin/commit/c2ad99da2bf166de7e114e1e129ee435c9e23756
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M po/hy.po
    M po/uz.po

  Log Message:
  -----------
  Merge branch 'MAINT_4_2_13' into QA_4_2


  Commit: f5a99f5a6383b5bf892139e85f791a7dbccafc23
      https://github.com/phpmyadmin/phpmyadmin/commit/f5a99f5a6383b5bf892139e85f791a7dbccafc23
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M scripts/generate-mo

  Log Message:
  -----------
  Improve locales compiling

- return correct error code on failure
- try to compile all locales and report error for each failing
- color error messages

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: c4ffccd6e240ed70fd31fa085fe9469d267ef52d
      https://github.com/phpmyadmin/phpmyadmin/commit/c4ffccd6e240ed70fd31fa085fe9469d267ef52d
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M scripts/generate-mo

  Log Message:
  -----------
  Merge branch 'MAINT_4_2_13' into QA_4_2


  Commit: 67cade9d806e9b32b0cf35d5913f215bca2144b0
      https://github.com/phpmyadmin/phpmyadmin/commit/67cade9d806e9b32b0cf35d5913f215bca2144b0
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M ChangeLog
    M libraries/relation.lib.php

  Log Message:
  -----------
  Merge commit '19802ca9f9cb12c3dd9034a0928f2c417bf91d30' into MAINT_4_3_0


  Commit: 357bd55571d3d2a48f285f7e8f4c7c26ad2dcfc1
      https://github.com/phpmyadmin/phpmyadmin/commit/357bd55571d3d2a48f285f7e8f4c7c26ad2dcfc1
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Log Message:
  -----------
  Merge commit 'e9e3998949adbacf82b90e9d2061bf56e609a373' into MAINT_4_3_0


  Commit: 779c318313a540561c567ce9f66478df894dd339
      https://github.com/phpmyadmin/phpmyadmin/commit/779c318313a540561c567ce9f66478df894dd339
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Log Message:
  -----------
  Merge commit '942f366e71605bb423d786523ad086396cf62afb' into MAINT_4_3_0


  Commit: 5bd1aca4aab1fee6c1afd0bb94284a302863fcff
      https://github.com/phpmyadmin/phpmyadmin/commit/5bd1aca4aab1fee6c1afd0bb94284a302863fcff
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Log Message:
  -----------
  Merge commit 'c2ad99da2bf166de7e114e1e129ee435c9e23756' into MAINT_4_3_0


  Commit: 7e4baefbf066bbd3b63c85f3386af93dfe66067e
      https://github.com/phpmyadmin/phpmyadmin/commit/7e4baefbf066bbd3b63c85f3386af93dfe66067e
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M scripts/generate-mo

  Log Message:
  -----------
  Merge branch 'QA_4_2' into MAINT_4_3_0


  Commit: e4a933de8fe27c8d9f2fd2f76716e5322cc62f2b
      https://github.com/phpmyadmin/phpmyadmin/commit/e4a933de8fe27c8d9f2fd2f76716e5322cc62f2b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Do not let coveralls fail the build

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 0bf779c61c1a6421ce5cd4318966b520ecc3f5af
      https://github.com/phpmyadmin/phpmyadmin/commit/0bf779c61c1a6421ce5cd4318966b520ecc3f5af
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge branch 'MAINT_4_2_13' into QA_4_2


  Commit: 7ecdaa2fd2b35b86971b1305c10e4b3d24c8cd37
      https://github.com/phpmyadmin/phpmyadmin/commit/7ecdaa2fd2b35b86971b1305c10e4b3d24c8cd37
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Log Message:
  -----------
  Merge branch 'QA_4_2' into MAINT_4_3_0

Conflicts:
	.travis.yml


  Commit: 996e7314a877e469ac9a2b288c6bb6eb71d9f933
      https://github.com/phpmyadmin/phpmyadmin/commit/996e7314a877e469ac9a2b288c6bb6eb71d9f933
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Cache composer cache

Signed-off-by: Michal Čihař <michal at cihar.com>

Conflicts:
	.travis.yml

Conflicts:
	.travis.yml


  Commit: 63c5e674cc097b3bc0419ad02894179040732f38
      https://github.com/phpmyadmin/phpmyadmin/commit/63c5e674cc097b3bc0419ad02894179040732f38
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge branch 'MAINT_4_2_13' into QA_4_2


  Commit: dc81ab1b3b08b1b67a17f6a96a2a93901fe9ac89
      https://github.com/phpmyadmin/phpmyadmin/commit/dc81ab1b3b08b1b67a17f6a96a2a93901fe9ac89
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge branch 'QA_4_2' into MAINT_4_3_0


  Commit: b4b2f8787d472b55546d736dbd65557db105cbc8
      https://github.com/phpmyadmin/phpmyadmin/commit/b4b2f8787d472b55546d736dbd65557db105cbc8
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-12-05 (Fri, 05 Dec 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.3.0 release

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 39da61c0992f07ebacdd2c7d4ee7ef2b8315c413
      https://github.com/phpmyadmin/phpmyadmin/commit/39da61c0992f07ebacdd2c7d4ee7ef2b8315c413
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-12-05 (Fri, 05 Dec 2014)

  Changed paths:
    M .coveralls.yml
    A .scrutinizer.yml
    M .travis.yml
    M ChangeLog
    M PMAStandard/ruleset.xml
    M README
    M README.rst
    M browse_foreigners.php
    M build.xml
    M chk_rel.php
    M composer.json
    M config.sample.inc.php
    A db_central_columns.php
    M db_create.php
    M db_datadict.php
    A db_designer.php
    M db_import.php
    M db_operations.php
    M db_printview.php
    M db_qbe.php
    M db_search.php
    A db_sql_autocomplete.php
    M db_structure.php
    M db_tracking.php
    M doc/conf.py
    M doc/config.rst
    M doc/copyright.rst
    M doc/credits.rst
    M doc/faq.rst
    M doc/setup.rst
    M error_report.php
    M examples/config.manyhosts.inc.php
    M examples/create_tables.sql
    M examples/create_tables_drizzle.sql
    M examples/openid.php
    M examples/signon-script.php
    A examples/upgrade_column_info_4_3_0+.sql
    M export.php
    M file_echo.php
    M gis_data_editor.php
    M import.php
    M import_status.php
    M index.php
    M js/ajax.js
    A js/big_ints.js
    M js/chart.js
    A js/codemirror/addon/hint/show-hint.js
    A js/codemirror/addon/hint/sql-hint.js
    M js/codemirror/addon/runmode/runmode.js
    M js/codemirror/lib/codemirror.js
    M js/codemirror/mode/sql/sql.js
    M js/common.js
    M js/config.js
    A js/console.js
    A js/db_central_columns.js
    M js/db_qbe.js
    M js/db_search.js
    M js/db_structure.js
    M js/error_report.js
    M js/export.js
    M js/functions.js
    M js/gis_data_editor.js
    M js/import.js
    M js/indexes.js
    R js/jquery/jquery.menuResizer-1.0.js
    R js/jquery/jquery.sprintf.js
    M js/jquery/jquery.uitablefilter.js
    M js/makegrid.js
    A js/menu-resizer.js
    M js/messages.php
    M js/multi_column_sort.js
    M js/navigation.js
    A js/normalization.js
    R js/pmd/ajax.js
    A js/pmd/designer_db.js
    A js/pmd/designer_objects.js
    A js/pmd/designer_page.js
    M js/pmd/history.js
    M js/pmd/iecanvas.js
    M js/pmd/init.js
    M js/pmd/move.js
    R js/querywindow.js
    M js/rte.js
    M js/server_databases.js
    M js/server_privileges.js
    M js/server_status_monitor.js
    A js/server_status_processes.js
    M js/server_user_groups.js
    A js/sprintf.js
    M js/sql.js
    M js/tbl_change.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
    A js/transformations/image_upload.js
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    A libraries/Console.class.php
    M libraries/DBQbe.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DbSearch.class.php
    M libraries/DisplayResults.class.php
    M libraries/Error.class.php
    M libraries/Error_Handler.class.php
    M libraries/File.class.php
    M libraries/Font.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/List.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/Message.class.php
    M libraries/OutputBuffering.class.php
    M libraries/PDF.class.php
    M libraries/PMA.php
    M libraries/Partition.class.php
    M libraries/RecentFavoriteTable.class.php
    M libraries/Response.class.php
    M libraries/SavedSearches.class.php
    M libraries/Scripts.class.php
    M libraries/ServerStatusData.class.php
    M libraries/StorageEngine.class.php
    M libraries/String.class.php
    M libraries/StringByte.int.php
    R libraries/StringMB.class.php
    R libraries/StringNative.class.php
    M libraries/StringType.int.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Theme.class.php
    M libraries/Theme_Manager.class.php
    M libraries/Tracker.class.php
    M libraries/Types.class.php
    M libraries/Util.class.php
    M libraries/bookmark.lib.php
    M libraries/browse_foreigners.lib.php
    M libraries/build_html_for_db.lib.php
    A libraries/central_columns.lib.php
    M libraries/charset_conversion.lib.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/config/ConfigFile.class.php
    M libraries/config/Form.class.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/FormDisplay.tpl.php
    M libraries/config/ServerConfigChecks.class.php
    M libraries/config/Validator.class.php
    M libraries/config/config_functions.lib.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/core.lib.php
    M libraries/create_addfield.lib.php
    M libraries/database_interface.inc.php
    M libraries/db_common.inc.php
    A libraries/db_designer.lib.php
    M libraries/db_info.inc.php
    A libraries/db_printview.lib.php
    M libraries/db_table_exists.lib.php
    M libraries/dbi/DBIDrizzle.class.php
    M libraries/dbi/DBIDummy.class.php
    M libraries/dbi/DBIExtension.int.php
    M libraries/dbi/DBIMysql.class.php
    M libraries/dbi/DBIMysqli.class.php
    M libraries/dbi/drizzle-wrappers.lib.php
    M libraries/display_change_password.lib.php
    M libraries/display_create_database.lib.php
    M libraries/display_create_table.lib.php
    M libraries/display_export.inc.php
    M libraries/display_export.lib.php
    M libraries/display_git_revision.lib.php
    M libraries/display_import.lib.php
    M libraries/display_import_ajax.lib.php
    M libraries/display_structure.inc.php
    M libraries/engines/innodb.lib.php
    M libraries/engines/ndbcluster.lib.php
    M libraries/engines/pbxt.lib.php
    M libraries/error_report.lib.php
    M libraries/export.lib.php
    M libraries/file_listing.lib.php
    M libraries/gis/GIS_Factory.class.php
    M libraries/gis/GIS_Geometry.class.php
    M libraries/gis/GIS_Geometrycollection.class.php
    M libraries/gis/GIS_Linestring.class.php
    M libraries/gis/GIS_Multilinestring.class.php
    M libraries/gis/GIS_Multipoint.class.php
    M libraries/gis/GIS_Multipolygon.class.php
    M libraries/gis/GIS_Point.class.php
    M libraries/gis/GIS_Polygon.class.php
    M libraries/gis/GIS_Visualization.class.php
    M libraries/iconv_wrapper.lib.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/ip_allow_deny.lib.php
    M libraries/mime.lib.php
    M libraries/mult_submits.inc.php
    M libraries/mult_submits.lib.php
    M libraries/mysql_charsets.inc.php
    M libraries/mysql_charsets.lib.php
    M libraries/navigation/Navigation.class.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/NodeFactory.class.php
    M libraries/navigation/Nodes/Node.class.php
    M libraries/navigation/Nodes/Node_Column.class.php
    M libraries/navigation/Nodes/Node_Column_Container.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_DatabaseChild.class.php
    M libraries/navigation/Nodes/Node_Database_Container.class.php
    M libraries/navigation/Nodes/Node_Event.class.php
    M libraries/navigation/Nodes/Node_Event_Container.class.php
    M libraries/navigation/Nodes/Node_Function.class.php
    M libraries/navigation/Nodes/Node_Function_Container.class.php
    M libraries/navigation/Nodes/Node_Index.class.php
    M libraries/navigation/Nodes/Node_Index_Container.class.php
    M libraries/navigation/Nodes/Node_Procedure.class.php
    M libraries/navigation/Nodes/Node_Procedure_Container.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/navigation/Nodes/Node_Table_Container.class.php
    M libraries/navigation/Nodes/Node_Trigger.class.php
    M libraries/navigation/Nodes/Node_Trigger_Container.class.php
    M libraries/navigation/Nodes/Node_View.class.php
    M libraries/navigation/Nodes/Node_View_Container.class.php
    A libraries/normalization.lib.php
    M libraries/operations.lib.php
    M libraries/parse_analyze.inc.php
    M libraries/phpseclib/Crypt/AES.php
    A libraries/phpseclib/Crypt/Base.php
    A libraries/phpseclib/Crypt/Random.php
    M libraries/phpseclib/Crypt/Rijndael.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/AuthenticationPlugin.class.php
    M libraries/plugins/ExportPlugin.class.php
    A libraries/plugins/IOTransformationsPlugin.class.php
    M libraries/plugins/ImportPlugin.class.php
    R libraries/plugins/PluginManager.class.php
    R libraries/plugins/PluginObserver.class.php
    A libraries/plugins/SchemaPlugin.class.php
    M libraries/plugins/TransformationsPlugin.class.php
    M libraries/plugins/auth/AuthenticationConfig.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/auth/AuthenticationHttp.class.php
    M libraries/plugins/auth/AuthenticationSignon.class.php
    M libraries/plugins/export/ExportCodegen.class.php
    M libraries/plugins/export/ExportCsv.class.php
    M libraries/plugins/export/ExportExcel.class.php
    M libraries/plugins/export/ExportHtmlword.class.php
    M libraries/plugins/export/ExportJson.class.php
    M libraries/plugins/export/ExportLatex.class.php
    M libraries/plugins/export/ExportMediawiki.class.php
    M libraries/plugins/export/ExportOds.class.php
    M libraries/plugins/export/ExportOdt.class.php
    M libraries/plugins/export/ExportPdf.class.php
    M libraries/plugins/export/ExportPhparray.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportTexytext.class.php
    M libraries/plugins/export/ExportXml.class.php
    M libraries/plugins/export/ExportYaml.class.php
    M libraries/plugins/export/PMA_ExportPdf.class.php
    M libraries/plugins/export/README
    M libraries/plugins/export/TableProperty.class.php
    M libraries/plugins/import/ImportCsv.class.php
    M libraries/plugins/import/ImportLdi.class.php
    M libraries/plugins/import/ImportMediawiki.class.php
    M libraries/plugins/import/ImportOds.class.php
    M libraries/plugins/import/ImportShp.class.php
    M libraries/plugins/import/ImportSql.class.php
    M libraries/plugins/import/ImportXml.class.php
    M libraries/plugins/import/README
    M libraries/plugins/import/ShapeFile.class.php
    M libraries/plugins/import/ShapeRecord.class.php
    A libraries/plugins/schema/Export_Relation_Schema.class.php
    A libraries/plugins/schema/RelationStats.class.php
    A libraries/plugins/schema/SchemaDia.class.php
    A libraries/plugins/schema/SchemaEps.class.php
    A libraries/plugins/schema/SchemaPdf.class.php
    A libraries/plugins/schema/SchemaSvg.class.php
    A libraries/plugins/schema/TableStats.class.php
    A libraries/plugins/schema/dia/Dia_Relation_Schema.class.php
    A libraries/plugins/schema/dia/RelationStatsDia.class.php
    A libraries/plugins/schema/dia/TableStatsDia.class.php
    A libraries/plugins/schema/eps/Eps_Relation_Schema.class.php
    A libraries/plugins/schema/eps/RelationStatsEps.class.php
    A libraries/plugins/schema/eps/TableStatsEps.class.php
    A libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php
    A libraries/plugins/schema/pdf/RelationStatsPdf.class.php
    A libraries/plugins/schema/pdf/TableStatsPdf.class.php
    A libraries/plugins/schema/svg/RelationStatsSvg.class.php
    A libraries/plugins/schema/svg/Svg_Relation_Schema.class.php
    A libraries/plugins/schema/svg/TableStatsSvg.class.php
    R libraries/plugins/transformations/Application_Octetstream_Download.class.php
    R libraries/plugins/transformations/Application_Octetstream_Hex.class.php
    R libraries/plugins/transformations/Image_JPEG_Inline.class.php
    R libraries/plugins/transformations/Image_JPEG_Link.class.php
    R libraries/plugins/transformations/Image_PNG_Inline.class.php
    M libraries/plugins/transformations/TEMPLATE_ABSTRACT
    R libraries/plugins/transformations/Text_Plain_Bool2text.class.php
    R libraries/plugins/transformations/Text_Plain_Dateformat.class.php
    R libraries/plugins/transformations/Text_Plain_External.class.php
    R libraries/plugins/transformations/Text_Plain_Formatted.class.php
    R libraries/plugins/transformations/Text_Plain_Imagelink.class.php
    M libraries/plugins/transformations/Text_Plain_Preappend.class.php
    R libraries/plugins/transformations/Text_Plain_Sql.class.php
    M libraries/plugins/transformations/abstract/Bool2TextTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/ImageUploadTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/PreApPendTransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/RegexValidationTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/TextFileUploadTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
    A libraries/plugins/transformations/input/Image_JPEG_Upload.class.php
    A libraries/plugins/transformations/input/Text_Plain_Fileupload.class.php
    A libraries/plugins/transformations/input/Text_Plain_Regexvalidation.class.php
    A libraries/plugins/transformations/output/Application_Octetstream_Download.class.php
    A libraries/plugins/transformations/output/Application_Octetstream_Hex.class.php
    A libraries/plugins/transformations/output/Image_JPEG_Inline.class.php
    A libraries/plugins/transformations/output/Image_JPEG_Link.class.php
    A libraries/plugins/transformations/output/Image_PNG_Inline.class.php
    A libraries/plugins/transformations/output/Text_Plain_Bool2text.class.php
    A libraries/plugins/transformations/output/Text_Plain_Dateformat.class.php
    A libraries/plugins/transformations/output/Text_Plain_External.class.php
    A libraries/plugins/transformations/output/Text_Plain_Formatted.class.php
    A libraries/plugins/transformations/output/Text_Plain_Imagelink.class.php
    A libraries/plugins/transformations/output/Text_Plain_Sql.class.php
    M libraries/pmd_common.php
    M libraries/properties/options/OptionsPropertyItem.class.php
    A libraries/properties/plugins/SchemaPluginProperties.class.php
    M libraries/relation.lib.php
    M libraries/relation_cleanup.lib.php
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_footer.lib.php
    A libraries/rte/rte_general.lib.php
    M libraries/rte/rte_list.lib.php
    M libraries/rte/rte_main.inc.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php
    M libraries/rte/rte_words.lib.php
    M libraries/sanitizing.lib.php
    R libraries/schema/Dia_Relation_Schema.class.php
    R libraries/schema/Eps_Relation_Schema.class.php
    R libraries/schema/Export_Relation_Schema.class.php
    R libraries/schema/Pdf_Relation_Schema.class.php
    R libraries/schema/Svg_Relation_Schema.class.php
    R libraries/schema/TableStats.class.php
    R libraries/schema/User_Schema.class.php
    M libraries/select_lang.lib.php
    M libraries/select_server.lib.php
    M libraries/server_bin_log.lib.php
    M libraries/server_common.inc.php
    M libraries/server_databases.lib.php
    M libraries/server_engines.lib.php
    M libraries/server_plugins.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status.lib.php
    M libraries/server_status_monitor.lib.php
    A libraries/server_status_processes.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_user_groups.lib.php
    M libraries/server_users.lib.php
    M libraries/server_variables.lib.php
    M libraries/session.inc.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.data.php
    M libraries/sqlparser.lib.php
    R libraries/string.inc.php
    A libraries/string.lib.php
    A libraries/stringMb.lib.php
    A libraries/stringNative.lib.php
    M libraries/structure.lib.php
    M libraries/sysinfo.lib.php
    M libraries/tbl_chart.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_common.inc.php
    M libraries/tbl_gis_visualization.lib.php
    M libraries/tbl_indexes.lib.php
    M libraries/tbl_info.inc.php
    M libraries/tbl_printview.lib.php
    M libraries/tbl_relation.lib.php
    R libraries/tbl_tracking.lib.php
    M libraries/tbl_views.lib.php
    M libraries/tcpdf/README.TXT
    M libraries/tcpdf/include/tcpdf_colors.php
    M libraries/tcpdf/include/tcpdf_images.php
    M libraries/tcpdf/include/tcpdf_static.php
    M libraries/tcpdf/tcpdf.php
    A libraries/tracking.lib.php
    M libraries/transformations.lib.php
    M libraries/url_generating.lib.php
    M libraries/vendor_config.php
    M libraries/zip.lib.php
    M libraries/zip_extension.lib.php
    A normalization.php
    M phpunit.xml.dist
    R pmd_display_field.php
    R pmd_general.php
    R pmd_pdf.php
    R pmd_relation_new.php
    R pmd_relation_upd.php
    R pmd_save_pos.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
    A po/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    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
    A po/vi.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M prefs_forms.php
    M prefs_manage.php
    R querywindow.php
    R schema_edit.php
    M schema_export.php
    M scripts/advisor2po
    M scripts/create-release.sh
    M scripts/decode_bug.php
    M scripts/generate-mo
    M server_databases.php
    M server_privileges.php
    M server_replication.php
    M server_status.php
    M server_status_advisor.php
    M server_status_monitor.php
    A server_status_processes.php
    M server_status_queries.php
    M server_status_variables.php
    M server_user_groups.php
    M setup/frames/index.inc.php
    M setup/lib/ConfigGenerator.class.php
    M setup/lib/index.lib.php
    M setup/scripts.js
    M setup/styles.css
    M sql.php
    M tbl_addfield.php
    M tbl_change.php
    M tbl_chart.php
    M tbl_create.php
    M tbl_find_replace.php
    M tbl_get_field.php
    M tbl_gis_visualization.php
    M tbl_indexes.php
    R tbl_move_copy.php
    M tbl_operations.php
    M tbl_printview.php
    A tbl_recent_favorite.php
    M tbl_relation.php
    M tbl_replace.php
    M tbl_row_action.php
    M tbl_select.php
    M tbl_tracking.php
    M tbl_zoom_select.php
    M test/bootstrap-dist.php
    M test/classes/PMA_Advisor_test.php
    M test/classes/PMA_Config_test.php
    M test/classes/PMA_DBQbe_test.php
    M test/classes/PMA_DbSearch_test.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_Error_Handler_test.php
    M test/classes/PMA_Error_test.php
    M test/classes/PMA_Footer_test.php
    M test/classes/PMA_Header_test.php
    M test/classes/PMA_List_Database_test.php
    M test/classes/PMA_Menu_test.php
    M test/classes/PMA_Message_test.php
    M test/classes/PMA_Scripts_test.php
    A test/classes/PMA_ServerStatusData_test.php
    M test/classes/PMA_StorageEngine_test.php
    M test/classes/PMA_TableReplaceSearch_test.php
    M test/classes/PMA_TableSearch_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/PMA_Types_MySQL_test.php
    M test/classes/PMA_Util_test.php
    M test/classes/_data/gen_version_info/info.inc.php
    M test/classes/dbi/DBIDrizzle_test.php
    M test/classes/dbi/DBIMysql_test.php
    M test/classes/dbi/DBIMysqli_test.php
    M test/classes/gis/PMA_GIS_Geom_test.php
    M test/classes/gis/PMA_GIS_Geometry_test.php
    M test/classes/gis/PMA_GIS_Geometrycollection_test.php
    M test/classes/gis/PMA_GIS_Multilinestring_test.php
    M test/classes/gis/PMA_GIS_Multipoint_test.php
    M test/classes/gis/PMA_GIS_Multipolygon_test.php
    M test/classes/gis/PMA_GIS_Point_test.php
    M test/classes/gis/PMA_GIS_Polygon_test.php
    A test/classes/navigation/PMA_NavigationTree_test.php
    M test/classes/navigation/PMA_Navigation_test.php
    M test/classes/navigation/PMA_NodeFactory_test.php
    M test/classes/navigation/PMA_Node_Column_Container_test.php
    M test/classes/navigation/PMA_Node_Column_test.php
    M test/classes/navigation/PMA_Node_DatabaseChild_test.php
    M test/classes/navigation/PMA_Node_Database_test.php
    M test/classes/navigation/PMA_Node_Event_Container_test.php
    M test/classes/navigation/PMA_Node_Event_test.php
    M test/classes/navigation/PMA_Node_Function_Container_test.php
    M test/classes/navigation/PMA_Node_Function_test.php
    M test/classes/navigation/PMA_Node_Index_Container_test.php
    M test/classes/navigation/PMA_Node_Index_test.php
    M test/classes/navigation/PMA_Node_Procedure_Container_test.php
    M test/classes/navigation/PMA_Node_Procedure_test.php
    M test/classes/navigation/PMA_Node_Table_Container_test.php
    M test/classes/navigation/PMA_Node_Table_test.php
    M test/classes/navigation/PMA_Node_Trigger_Container_test.php
    M test/classes/navigation/PMA_Node_Trigger_test.php
    M test/classes/navigation/PMA_Node_View_Container_test.php
    M test/classes/navigation/PMA_Node_View_test.php
    M test/classes/navigation/PMA_Node_test.php
    R test/classes/plugin/PMA_PluginManager_test.php
    M test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
    M test/classes/plugin/auth/PMA_AuthenticationSignon_test.php
    M test/classes/plugin/export/PMA_ExportCsv_test.php
    M test/classes/plugin/export/PMA_ExportHtmlword_test.php
    M test/classes/plugin/export/PMA_ExportJson_test.php
    M test/classes/plugin/export/PMA_ExportLatex_test.php
    M test/classes/plugin/export/PMA_ExportMediawiki_test.php
    M test/classes/plugin/export/PMA_ExportOdt_test.php
    M test/classes/plugin/export/PMA_ExportPdf_test.php
    M test/classes/plugin/export/PMA_ExportSql_test.php
    M test/classes/plugin/export/PMA_ExportTexytext_test.php
    M test/classes/plugin/export/PMA_ExportXml_test.php
    M test/classes/plugin/export/PMA_TableProperty_test.php
    M test/classes/plugin/import/ImportCsv_test.php
    M test/classes/plugin/import/ImportLdi_test.php
    M test/classes/plugin/import/ImportMediawiki_test.php
    M test/classes/plugin/import/ImportOds_test.php
    M test/classes/plugin/import/ImportShp_test.php
    M test/classes/plugin/import/ImportSql_test.php
    M test/classes/plugin/import/ImportXml_test.php
    R test/classes/plugin/transformations/Image_JPEG_Inline_test.php
    R test/classes/plugin/transformations/Image_Link_test.php
    R test/classes/plugin/transformations/Image_PNG_Inline_test.php
    R test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
    R test/classes/plugin/transformations/Text_Plain_Download_test.php
    R test/classes/plugin/transformations/Text_Plain_External_test.php
    R test/classes/plugin/transformations/Text_Plain_Formatted_test.php
    R test/classes/plugin/transformations/Text_Plain_Hex_test.php
    R test/classes/plugin/transformations/Text_Plain_Imagelink_test.php
    R test/classes/plugin/transformations/Text_Plain_Link_test.php
    R test/classes/plugin/transformations/Text_Plain_Longtoipv4_test.php
    R test/classes/plugin/transformations/Text_Plain_Sql_test.php
    R test/classes/plugin/transformations/Text_Plain_Substring_test.php
    A test/classes/plugin/transformations/Transformation_Plugins_test.php
    M test/classes/schema/Dia_Relation_Schema_test.php
    M test/classes/schema/Eps_Relation_Schema_test.php
    M test/classes/schema/Export_Relation_Schema_test.php
    M test/classes/schema/Pdf_Relation_Schema_test.php
    M test/classes/schema/Svg_Relation_Schema_test.php
    R test/classes/schema/User_Schema_test.php
    M test/engines/PMA_StorageEngine_innodb_test.php
    M test/libraries/PMA_ConfigFile_test.php
    M test/libraries/PMA_ConfigGenerator_test.php
    M test/libraries/PMA_GIS_modifyQuery_test.php
    A test/libraries/PMA_PMD_common_test.php
    M test/libraries/PMA_SQL_parser_test.php
    M test/libraries/PMA_SetupIndex_test.php
    R test/libraries/PMA_StringMB_test.php
    R test/libraries/PMA_StringNative_test.php
    M test/libraries/PMA_Tracker_test.php
    A test/libraries/PMA_browse_foreigners_test.php
    M test/libraries/PMA_build_html_for_db_test.php
    A test/libraries/PMA_central_columns_test.php
    A test/libraries/PMA_designer_test.php
    M test/libraries/PMA_display_change_password_test.php
    M test/libraries/PMA_display_export_test.php
    M test/libraries/PMA_escapeJsString_test.php
    A test/libraries/PMA_export_test.php
    M test/libraries/PMA_generateCommonUrl_test.php
    M test/libraries/PMA_import_test.php
    M test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_ip_allow_deny_test.php
    M test/libraries/PMA_mult_submits_test.php
    M test/libraries/PMA_mysql_charsets_test.php
    A test/libraries/PMA_normalization_test.php
    M test/libraries/PMA_operations_test.php
    M test/libraries/PMA_prettyPrint_test.php
    M test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/PMA_relation_test.php
    M test/libraries/PMA_select_server_test.php
    M test/libraries/PMA_server_collations_test.php
    M test/libraries/PMA_server_databases_test.php
    M test/libraries/PMA_server_engines_test.php
    M test/libraries/PMA_server_plugins_test.php
    M test/libraries/PMA_server_privileges_test.php
    M test/libraries/PMA_server_replication_test.php
    M test/libraries/PMA_server_status_advisor_test.php
    M test/libraries/PMA_server_status_monitor_test.php
    A test/libraries/PMA_server_status_processes_test.php
    M test/libraries/PMA_server_status_queries_test.php
    M test/libraries/PMA_server_status_test.php
    M test/libraries/PMA_server_status_variables_test.php
    M test/libraries/PMA_sql_query_form_test.php
    M test/libraries/PMA_string_test.php
    M test/libraries/PMA_structure_test.php
    M test/libraries/PMA_tbl_chart_test.php
    M test/libraries/PMA_tbl_columns_definition_form_test.php
    M test/libraries/PMA_tbl_gis_visualization_test.php
    M test/libraries/PMA_tbl_indexes_test.php
    M test/libraries/PMA_tbl_printview_test.php
    M test/libraries/PMA_tbl_relation_test.php
    M test/libraries/PMA_tbl_tracking_test.php
    M test/libraries/PMA_tbl_views_test.php
    M test/libraries/PMA_transformation_test.php
    M test/libraries/PMA_user_preferences_test.php
    M test/libraries/PMA_zip_extension_test.php
    M test/libraries/PMA_zip_test.php
    M test/libraries/common/PMA_cache_test.php
    M test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
    M test/libraries/common/PMA_getIcon_test.php
    M test/libraries/common/PMA_showMessage_test_disabled.php
    A test/libraries/config/PMA_messages_inc_test.php
    M test/libraries/core/PMA_checkPageValidity_test.php
    M test/libraries/core/PMA_headerLocation_test.php
    M test/libraries/core/PMA_warnMissingExtension_test.php
    M test/libraries/php-gettext/Locales_test.php
    M test/libraries/php-gettext/PMA_FileReader_test.php
    M test/libraries/php-gettext/PMA_StreamReader_test.php
    M test/libraries/php-gettext/PMA_StringReader_test.php
    M test/libraries/php-gettext/PMA_gettext_test.php
    M test/libraries/php-gettext/Parsing_test.php
    M test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
    M test/libraries/rte/PMA_RTN_getEditorForm_test.php
    M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
    M test/libraries/rte/PMA_TRI_getEditorForm_test.php
    M test/libraries/select_lang/PMA_langDetails_test.php
    A test/libraries/stringMb_test.php
    A test/libraries/stringNative_test.php
    A test/libraries/string_test_abstract.php
    M test/selenium/PmaSeleniumDbEventsTest.php
    A test/selenium/PmaSeleniumNormalizationTest.php
    M test/selenium/PmaSeleniumTableBrowseTest.php
    M test/selenium/PmaSeleniumTableInsertTest.php
    M test/selenium/PmaSeleniumXssTest.php
    M test/selenium/TestBase.php
    M test/theme.php
    M themes.php
    M themes/original/css/common.css.php
    M themes/original/css/navigation.css.php
    A themes/original/img/b_saveimage.png
    A themes/original/img/bd_routine_add.png
    A themes/original/img/centralColumns.png
    A themes/original/img/centralColumns_add.png
    A themes/original/img/centralColumns_delete.png
    A themes/original/img/console.png
    A themes/original/img/normalize.png
    A themes/original/img/s_collapseall.png
    A themes/original/img/s_link.png
    A themes/original/img/s_lock.png
    A themes/original/img/s_unlink.png
    M themes/original/img/sprites.png
    M themes/original/layout.inc.php
    M themes/original/sprites.lib.php
    M themes/pmahomme/css/codemirror.css.php
    M themes/pmahomme/css/common.css.php
    M themes/pmahomme/css/navigation.css.php
    M themes/pmahomme/css/pmd.css.php
    A themes/pmahomme/img/b_saveimage.png
    A themes/pmahomme/img/bd_routine_add.png
    A themes/pmahomme/img/centralColumns.png
    A themes/pmahomme/img/centralColumns_add.png
    A themes/pmahomme/img/centralColumns_delete.png
    A themes/pmahomme/img/console.png
    A themes/pmahomme/img/normalize.png
    A themes/pmahomme/img/pmd/export.png
    A themes/pmahomme/img/pmd/page_add.png
    A themes/pmahomme/img/pmd/page_delete.png
    A themes/pmahomme/img/pmd/page_edit.png
    A themes/pmahomme/img/pmd/save_as.png
    A themes/pmahomme/img/s_collapseall.png
    A themes/pmahomme/img/s_link.png
    A themes/pmahomme/img/s_lock.png
    A themes/pmahomme/img/s_unlink.png
    M themes/pmahomme/img/sprites.png
    M themes/pmahomme/layout.inc.php
    M themes/pmahomme/sprites.lib.php
    M themes/sprites.css.php
    M themes/svg_gradient.php
    M transformation_overview.php
    M user_password.php
    M view_create.php
    M view_operations.php
    M webapp.php

  Log Message:
  -----------
  Merge branch 'MAINT_4_3_0' into STABLE


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/66ece0299ac4...39da61c0992f


More information about the Git mailing list