Branch: refs/heads/STABLE
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: aebfcfdc9f9f4f328c128e365e8e2ca209441e0c
      
https://github.com/phpmyadmin/phpmyadmin/commit/aebfcfdc9f9f4f328c128e365e8e2ca209441e0c
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

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

  Log Message:
  -----------
  4.2.5-dev

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: 782fe7a1e579f571111acaa852cb0d328aaaf119
      
https://github.com/phpmyadmin/phpmyadmin/commit/782fe7a1e579f571111acaa852cb0d328aaaf119
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M libraries/RecentFavoriteTable.class.php
    M libraries/navigation/Navigation.class.php
    M libraries/navigation/Nodes/Node_DatabaseChild.class.php
    M libraries/structure.lib.php

  Log Message:
  -----------
  Merge commit 'd4f754c' into QA_4_2


  Commit: aea604f8508b47ce1331acd360a15ee5398ce809
      
https://github.com/phpmyadmin/phpmyadmin/commit/aea604f8508b47ce1331acd360a15ee5398ce809
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M ChangeLog

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

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: f1253cf31f75b60218aaed611faf7139f9cb19b2
      
https://github.com/phpmyadmin/phpmyadmin/commit/f1253cf31f75b60218aaed611faf7139f9cb19b2
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  4.2.4 release

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: a30405fe0bbd97d6fae1a38908e53defc6c7bc94
      
https://github.com/phpmyadmin/phpmyadmin/commit/a30405fe0bbd97d6fae1a38908e53defc6c7bc94
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

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

  Log Message:
  -----------
  bug #4467 shell_exec() has been disabled for security reasons

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: 876d029549934647b427e058112186d32cc12e3d
      
https://github.com/phpmyadmin/phpmyadmin/commit/876d029549934647b427e058112186d32cc12e3d
  Author: Hugues Peccatte <hugues.pecca...@gmail.com>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Fix error when clicking 'Go' and having an empty textarea in SQL tab.

Signed-off-by: Hugues Peccatte <hugues.pecca...@gmail.com>


  Commit: da732cc88b64b2538735512d70558130f2b63dc7
      
https://github.com/phpmyadmin/phpmyadmin/commit/da732cc88b64b2538735512d70558130f2b63dc7
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-06-21 (Sat, 21 Jun 2014)

  Changed paths:
    M ChangeLog

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

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: 6b778e09d9cebe3ae05b251f60faa102413f572d
      
https://github.com/phpmyadmin/phpmyadmin/commit/6b778e09d9cebe3ae05b251f60faa102413f572d
  Author: Ann + J.M <phpmyad...@zweisteinsoft.de>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M db_operations.php
    M db_structure.php
    M examples/openid.php
    M examples/signon.php
    M import.php
    M libraries/Advisor.class.php
    M libraries/DBQbe.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DisplayResults.class.php
    M libraries/File.class.php
    M libraries/Message.class.php
    M libraries/PMA.php
    M libraries/Table.class.php
    M libraries/Util.class.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/config/ConfigFile.class.php
    M libraries/config/Validator.class.php
    M libraries/create_addfield.lib.php
    M libraries/dbi/DBIMysql.class.php
    M libraries/display_export.inc.php
    M libraries/display_export.lib.php
    M libraries/error_report.lib.php
    M libraries/export.lib.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/mysql_charsets.inc.php
    M libraries/mysql_charsets.lib.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/session.inc.php
    M libraries/sql.lib.php
    M libraries/structure.lib.php
    M libraries/url_generating.lib.php
    M test/libraries/common/PMA_cache_test.php

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

Signed-off-by: Ann + J.M <phpmyad...@zweisteinsoft.de>


  Commit: 72439c27df709e53b9a09b1eaf00f06b50f02810
      
https://github.com/phpmyadmin/phpmyadmin/commit/72439c27df709e53b9a09b1eaf00f06b50f02810
  Author: Sevdimali İsa <sevdimaliisa...@mail.ru>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M po/az.po

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

Currently translated at 29.7% (824 of 2770)


  Commit: 698e790f02a9e313292e24a5023e8b5c92703248
      
https://github.com/phpmyadmin/phpmyadmin/commit/698e790f02a9e313292e24a5023e8b5c92703248
  Author: Yungu Kim <crimso...@gmail.com>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M po/ko.po

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

Currently translated at 82.1% (2276 of 2770)


  Commit: 82cd44a988d44a3ba05c3048f275a06e8fc2f07d
      
https://github.com/phpmyadmin/phpmyadmin/commit/82cd44a988d44a3ba05c3048f275a06e8fc2f07d
  Author: Richard G. Nielsen <rich...@plaza.no>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M po/nb.po

  Log Message:
  -----------
  Translated using Weblate (Norwegian Bokmål)

Currently translated at 61.5% (1705 of 2770)


  Commit: 6fdf5e655146ec976aeefe43de6e3ed88b13b0da
      
https://github.com/phpmyadmin/phpmyadmin/commit/6fdf5e655146ec976aeefe43de6e3ed88b13b0da
  Author: Weblate <nore...@weblate.org>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M db_operations.php
    M db_structure.php
    M examples/openid.php
    M examples/signon.php
    M import.php
    M libraries/Advisor.class.php
    M libraries/DBQbe.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DisplayResults.class.php
    M libraries/File.class.php
    M libraries/Message.class.php
    M libraries/PMA.php
    M libraries/Table.class.php
    M libraries/Util.class.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/config/ConfigFile.class.php
    M libraries/config/Validator.class.php
    M libraries/create_addfield.lib.php
    M libraries/dbi/DBIMysql.class.php
    M libraries/display_export.inc.php
    M libraries/display_export.lib.php
    M libraries/error_report.lib.php
    M libraries/export.lib.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/mysql_charsets.inc.php
    M libraries/mysql_charsets.lib.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/session.inc.php
    M libraries/sql.lib.php
    M libraries/structure.lib.php
    M libraries/url_generating.lib.php
    M test/libraries/common/PMA_cache_test.php

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


  Commit: 1fd8fde4ca149c60cb65b8be7c01458d507405a3
      
https://github.com/phpmyadmin/phpmyadmin/commit/1fd8fde4ca149c60cb65b8be7c01458d507405a3
  Author: Ann + J.M <phpmyad...@zweisteinsoft.de>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M libraries/Table.class.php
    M test/classes/PMA_Message_test.php

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

Signed-off-by: Ann + J.M <phpmyad...@zweisteinsoft.de>


  Commit: 2a5430888dd78d328204ff1ce6bb0b2d39320c5b
      
https://github.com/phpmyadmin/phpmyadmin/commit/2a5430888dd78d328204ff1ce6bb0b2d39320c5b
  Author: Hugues Peccatte <hugues.pecca...@gmail.com>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Merge pull request #1247 from Tithugues/QA_4_2_fixEmptySQL

Fix error when clicking 'Go' and having an empty textarea in SQL tab. (bug 
#4470)


  Commit: 8b5ea8869db0c576b1c2f69c36935b010faeb972
      
https://github.com/phpmyadmin/phpmyadmin/commit/8b5ea8869db0c576b1c2f69c36935b010faeb972
  Author: Hugues Peccatte <hugues.pecca...@gmail.com>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update ChangeLog.

Signed-off-by: Hugues Peccatte <hugues.pecca...@gmail.com>


  Commit: 46091ff2e232362642e47dd05d3465f88707fc7c
      
https://github.com/phpmyadmin/phpmyadmin/commit/46091ff2e232362642e47dd05d3465f88707fc7c
  Author: Ann + J.M <phpmyad...@zweisteinsoft.de>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M libraries/insert_edit.lib.php

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

Signed-off-by: Ann + J.M <phpmyad...@zweisteinsoft.de>


  Commit: 1ac64c7d75b9cfabee4714dc1a1a81252eb55cf6
      
https://github.com/phpmyadmin/phpmyadmin/commit/1ac64c7d75b9cfabee4714dc1a1a81252eb55cf6
  Author: Sevdimali İsa <sevdimaliisa...@mail.ru>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M po/az.po

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

Currently translated at 31.0% (860 of 2770)


  Commit: cee3010288b47317a969d38b52845653f5dda6f9
      
https://github.com/phpmyadmin/phpmyadmin/commit/cee3010288b47317a969d38b52845653f5dda6f9
  Author: Weblate <nore...@weblate.org>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

  Changed paths:
    M libraries/insert_edit.lib.php

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


  Commit: 1fb1093d0dfe5f9c1431a2d208853b4d1d56fbc4
      
https://github.com/phpmyadmin/phpmyadmin/commit/1fb1093d0dfe5f9c1431a2d208853b4d1d56fbc4
  Author: Hugues Peccatte <hugues.pecca...@gmail.com>
  Date:   2014-06-22 (Sun, 22 Jun 2014)

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

  Log Message:
  -----------
  Add missing include. (bug #4463)

Signed-off-by: Hugues Peccatte <hugues.pecca...@gmail.com>


  Commit: 2a807fe07319c28356117f7c1bdf6582890535ba
      
https://github.com/phpmyadmin/phpmyadmin/commit/2a807fe07319c28356117f7c1bdf6582890535ba
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

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

  Log Message:
  -----------
  Merge pull request #1248 from Tithugues/QA_4_2_b4463

Add missing include. (bug #4463)


  Commit: 26dab85f4488a7902a3ceb4740bebdbba61a723b
      
https://github.com/phpmyadmin/phpmyadmin/commit/26dab85f4488a7902a3ceb4740bebdbba61a723b
  Author: Sevdimali İsa <sevdimaliisa...@mail.ru>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

  Changed paths:
    M po/az.po

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

Currently translated at 38.4% (1066 of 2770)


  Commit: e1621b890fadff01f4a237e3a5b38329ea31eba4
      
https://github.com/phpmyadmin/phpmyadmin/commit/e1621b890fadff01f4a237e3a5b38329ea31eba4
  Author: Kristjan Räts <kristjanr...@gmail.com>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

  Changed paths:
    M po/et.po

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

Currently translated at 100.0% (2770 of 2770)


  Commit: 0c60471ae5fc11af3b9deca40fd5ae1628989638
      
https://github.com/phpmyadmin/phpmyadmin/commit/0c60471ae5fc11af3b9deca40fd5ae1628989638
  Author: Thiago Sabaia <thiago.sab...@parqueproducoes.com.br>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

  Changed paths:
    M po/pt_BR.po

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

Currently translated at 99.9% (2768 of 2770)


  Commit: 31b439366f29471d70a8e3c8a0d965a359330ee2
      
https://github.com/phpmyadmin/phpmyadmin/commit/31b439366f29471d70a8e3c8a0d965a359330ee2
  Author: Weblate <nore...@weblate.org>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

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

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


  Commit: 48b0bfd25961e187eea049f0530ca34704f91841
      
https://github.com/phpmyadmin/phpmyadmin/commit/48b0bfd25961e187eea049f0530ca34704f91841
  Author: Chirayu Chiripal <chirayu.chiri...@gmail.com>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M test/classes/plugin/PMA_PluginManager_test.php

  Log Message:
  -----------
  no need to disable contructor of SplObjectStorage

Signed-off-by: Chirayu Chiripal <chirayu.chiri...@gmail.com>


  Commit: 212195a253fe0c113c97af747695c5a5217f47cd
      
https://github.com/phpmyadmin/phpmyadmin/commit/212195a253fe0c113c97af747695c5a5217f47cd
  Author: Sevdimali İsa <sevdimaliisa...@mail.ru>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M po/az.po

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

Currently translated at 40.0% (1108 of 2770)


  Commit: c81e1acd4841607d288eb514c318b5f29f0631a0
      
https://github.com/phpmyadmin/phpmyadmin/commit/c81e1acd4841607d288eb514c318b5f29f0631a0
  Author: Weblate <nore...@weblate.org>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M test/classes/plugin/PMA_PluginManager_test.php

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


  Commit: 026c8184dd3702d97e231e75f7ba803da151f692
      
https://github.com/phpmyadmin/phpmyadmin/commit/026c8184dd3702d97e231e75f7ba803da151f692
  Author: Chirayu Chiripal <chirayu.chiri...@gmail.com>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

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

  Log Message:
  -----------
  bug-4473: incorrect result count when having clause is used w/o group by

Signed-off-by: Chirayu Chiripal <chirayu.chiri...@gmail.com>


  Commit: e6f6dab3b096e78d8118b29495085753a9095d2d
      
https://github.com/phpmyadmin/phpmyadmin/commit/e6f6dab3b096e78d8118b29495085753a9095d2d
  Author: Michal Čihař <mic...@cihar.com>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

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

  Log Message:
  -----------
  Fixed cookie based login for installations without mcrypt

bug #4469

Signed-off-by: Michal Čihař <mic...@cihar.com>


  Commit: 18370fc63eb17b7bedd0112b46f746c3648574ca
      
https://github.com/phpmyadmin/phpmyadmin/commit/18370fc63eb17b7bedd0112b46f746c3648574ca
  Author: Giovanni Sora <g.s...@tiscali.it>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M po/ia.po

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

Currently translated at 54.5% (1512 of 2770)


  Commit: 90a8a74afa54c0afba3b27169694d8ce77f83c6b
      
https://github.com/phpmyadmin/phpmyadmin/commit/90a8a74afa54c0afba3b27169694d8ce77f83c6b
  Author: Weblate <nore...@weblate.org>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

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

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


  Commit: e0933c8cba1d69d858ec3d98a6d93e30978eb688
      
https://github.com/phpmyadmin/phpmyadmin/commit/e0933c8cba1d69d858ec3d98a6d93e30978eb688
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

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

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

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: b42eb72b8ce8e65fb92b4c83c9ac148c73e0836d
      
https://github.com/phpmyadmin/phpmyadmin/commit/b42eb72b8ce8e65fb92b4c83c9ac148c73e0836d
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Add index: increase the chance that the dialog's footer will be visible

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: 18e6cfd5c5109736ea077d1f47e6b8a72e9dc074
      
https://github.com/phpmyadmin/phpmyadmin/commit/18e6cfd5c5109736ea077d1f47e6b8a72e9dc074
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M ChangeLog
    M doc/config.rst
    M doc/require.rst
    M index.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php

  Log Message:
  -----------
  mcrypt: remove the requirement (64-bit) and the related warning

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: 75d79739e51124f1965e0adbf5c3e7c2701cf417
      
https://github.com/phpmyadmin/phpmyadmin/commit/75d79739e51124f1965e0adbf5c3e7c2701cf417
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

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

  Log Message:
  -----------
  4.2.5 release

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: 9b59726683254dfdb9112cecebd14295662ef3ed
      
https://github.com/phpmyadmin/phpmyadmin/commit/9b59726683254dfdb9112cecebd14295662ef3ed
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M ChangeLog
    M README
    M db_operations.php
    M db_structure.php
    M doc/conf.py
    M doc/config.rst
    M doc/require.rst
    M examples/openid.php
    M examples/signon.php
    M import.php
    M index.php
    M js/functions.js
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    M libraries/DBQbe.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DisplayResults.class.php
    M libraries/File.class.php
    M libraries/Message.class.php
    M libraries/PMA.php
    M libraries/Table.class.php
    M libraries/Util.class.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config/ConfigFile.class.php
    M libraries/config/Validator.class.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/create_addfield.lib.php
    M libraries/dbi/DBIMysql.class.php
    M libraries/display_export.inc.php
    M libraries/display_export.lib.php
    M libraries/error_report.lib.php
    M libraries/export.lib.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/insert_edit.lib.php
    M libraries/mysql_charsets.inc.php
    M libraries/mysql_charsets.lib.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/session.inc.php
    M libraries/sql.lib.php
    M libraries/structure.lib.php
    M libraries/url_generating.lib.php
    M po/az.po
    M po/et.po
    M po/ia.po
    M po/ko.po
    M po/nb.po
    M po/pt_BR.po
    M test/classes/PMA_Message_test.php
    M test/classes/plugin/PMA_PluginManager_test.php
    M test/libraries/common/PMA_cache_test.php

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


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/6a6923493905...9b5972668325
------------------------------------------------------------------------------
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to