Branch: refs/heads/STABLE Home: https://github.com/phpmyadmin/phpmyadmin Commit: 380e8940b1450a2a4df25b453d44816709a9ba2e https://github.com/phpmyadmin/phpmyadmin/commit/380e8940b1450a2a4df25b453d44... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-09 (Thu, 09 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: ----------- bug #4552 Incorrect routines display for database due to case insensitive checks
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: c42beaa705fefaac11697e1c550481f78a6280ba https://github.com/phpmyadmin/phpmyadmin/commit/c42beaa705fefaac11697e1c5504... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-09 (Thu, 09 Oct 2014)
Changed paths: M ChangeLog M export.php M js/makegrid.js M libraries/DisplayResults.class.php M libraries/Util.class.php M libraries/config.default.php M libraries/dbi/DBIDummy.class.php M libraries/plugins/export/ExportXml.class.php M po/bg.po M po/ca.po M po/de.po M po/gl.po M po/ksh.po M po/ru.po M po/tr.po
Log Message: ----------- Merge branch 'QA_4_2' into Bug4552
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 4fb60125fba90a4da3f116314f21f4a17d2787f3 https://github.com/phpmyadmin/phpmyadmin/commit/4fb60125fba90a4da3f116314f21... Author: Marc Delisle marc@infomarc.info Date: 2014-10-11 (Sat, 11 Oct 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.2.11-dev
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 9492a73fd19f5f62dae99e9631ceec322c789cbc https://github.com/phpmyadmin/phpmyadmin/commit/9492a73fd19f5f62dae99e9631ce... Author: Xosé Calvo xosecalvo@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 86.3% (2389 of 2768 strings)
[CI skip]
Commit: 6dcb49a959327760a83f6776440702cf7caa4b10 https://github.com/phpmyadmin/phpmyadmin/commit/6dcb49a959327760a83f67764407... Author: Anders Jonsson anders.jonsson@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 99.7% (2762 of 2768 strings)
[CI skip]
Commit: f1d862096d337d50e647ee6c0a171c4497c19b46 https://github.com/phpmyadmin/phpmyadmin/commit/f1d862096d337d50e647ee6c0a17... Author: Weblate noreply@weblate.org Date: 2014-10-11 (Sat, 11 Oct 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: 360073a93392e1a38e9d825f4b4668717885164c https://github.com/phpmyadmin/phpmyadmin/commit/360073a93392e1a38e9d825f4b46... Author: Marc Delisle marc@infomarc.info Date: 2014-10-11 (Sat, 11 Oct 2014)
Changed paths: M ChangeLog
Log Message: ----------- 4.2.10 release
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: bd259a9ed982480dcd49f06d94e7dce759f1ee1a https://github.com/phpmyadmin/phpmyadmin/commit/bd259a9ed982480dcd49f06d94e7... Author: Smita Kumari kumarismita62@gmail.com Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths: M ChangeLog M pmd_general.php
Log Message: ----------- removing extra slash character
Signed-off-by: Smita Kumari kumarismita62@gmail.com
Commit: b57fc337ddfea436e1aa2bbeea3fbec48e2eb4f4 https://github.com/phpmyadmin/phpmyadmin/commit/b57fc337ddfea436e1aa2bbeea3f... Author: Smita Kumari kumarismita62@gmail.com Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths: M ChangeLog M pmd_general.php
Log Message: ----------- Merge pull request #1376 from smita786/QA_4_2
Fix: Table_onover is not defined error.
Commit: 61dedd86295ddeba44bf548a51cafe4db33e07b1 https://github.com/phpmyadmin/phpmyadmin/commit/61dedd86295ddeba44bf548a51ca... Author: hassan mokhtari persiste1@gmail.com Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths: M po/ar.po
Log Message: ----------- Translated using Weblate (Arabic)
Currently translated at 41.0% (1137 of 2768 strings)
[CI skip]
Commit: bb49e4a50fc349199957f009fd4f04d2872288fb https://github.com/phpmyadmin/phpmyadmin/commit/bb49e4a50fc349199957f009fd4f... Author: josep constanti jconstanti@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 87.2% (2414 of 2768 strings)
[CI skip]
Commit: 33a39799a0ec9a2241c97a50e1135d3ec9fd7ff0 https://github.com/phpmyadmin/phpmyadmin/commit/33a39799a0ec9a2241c97a50e113... Author: Weblate noreply@weblate.org Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths: M ChangeLog M pmd_general.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: 39498e594c37e4d81b3461ca2217a25075bf642e https://github.com/phpmyadmin/phpmyadmin/commit/39498e594c37e4d81b3461ca2217... Author: Marc Delisle marc@infomarc.info Date: 2014-10-13 (Mon, 13 Oct 2014)
Changed paths: M ChangeLog
Log Message: ----------- Move ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 3e70eb478943c9ff702c59912498b819a0aa7974 https://github.com/phpmyadmin/phpmyadmin/commit/3e70eb478943c9ff702c59912498... Author: Chanaka Dharmarathna pe.chanaka.ck@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: ----------- Resolved merge conflict in Changelog
Signed-off-by: Chanaka Dharmarathna pe.chanaka.ck@gmail.com
Commit: 38f3ae91cee1a01c3f440bc3a517a6bf07cb9faf https://github.com/phpmyadmin/phpmyadmin/commit/38f3ae91cee1a01c3f440bc3a517... Author: Chanaka Dharmarathna pe.chanaka.ck@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 'madhuracj-Bug4552' into QA_4_2
Commit: a10ce357a0e9144f649577f426d68df6869c23a4 https://github.com/phpmyadmin/phpmyadmin/commit/a10ce357a0e9144f649577f426d6... Author: Boyan Kehayov bkehayov@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 66.0% (1828 of 2768 strings)
[CI skip]
Commit: c7de289f9597ebde6cb37db8d576d55463ff020b https://github.com/phpmyadmin/phpmyadmin/commit/c7de289f9597ebde6cb37db8d576... Author: josep constanti jconstanti@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 87.5% (2424 of 2768 strings)
[CI skip]
Commit: 85866b8a841617148be43b73c7c9a203b5b9c076 https://github.com/phpmyadmin/phpmyadmin/commit/85866b8a841617148be43b73c7c9... Author: Michael Koch michael.koch@enough.de Date: 2014-10-16 (Thu, 16 Oct 2014)
Changed paths: M po/de.po
Log Message: ----------- Translated using Weblate (German)
Currently translated at 99.6% (2759 of 2768 strings)
[CI skip]
Commit: aa3fd712e9426ee2280d9a3032e4b1f55df39793 https://github.com/phpmyadmin/phpmyadmin/commit/aa3fd712e9426ee2280d9a3032e4... Author: Burak Yavuz hitowerdigit@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% (2768 of 2768 strings)
[CI skip]
Commit: f3fe7ca52891487c3b5a558e411293d40ed03936 https://github.com/phpmyadmin/phpmyadmin/commit/f3fe7ca52891487c3b5a558e4112... Author: Weblate noreply@weblate.org Date: 2014-10-16 (Thu, 16 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 remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: bdd76f18ce068302927d006b304faab2e6898998 https://github.com/phpmyadmin/phpmyadmin/commit/bdd76f18ce068302927d006b304f... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-17 (Fri, 17 Oct 2014)
Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message: ----------- bug #4259 reCaptcha sound session expired problem
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: bb056b5a205f374a6d2b454a0f1cd0ce3c9e1b72 https://github.com/phpmyadmin/phpmyadmin/commit/bb056b5a205f374a6d2b454a0f1c... Author: Edgars Neimanis edgarsneims5092@inbox.lv Date: 2014-10-17 (Fri, 17 Oct 2014)
Changed paths: M po/lv.po
Log Message: ----------- Translated using Weblate (Latvian)
Currently translated at 23.9% (664 of 2768 strings)
[CI skip]
Commit: e7f1c8506fc04e43c733532295f6a89ebc80f6b1 https://github.com/phpmyadmin/phpmyadmin/commit/e7f1c8506fc04e43c733532295f6... Author: Weblate noreply@weblate.org Date: 2014-10-17 (Fri, 17 Oct 2014)
Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.class.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: 27637d9ca0dd3d23b4db7f2d10761fbaf60e043a https://github.com/phpmyadmin/phpmyadmin/commit/27637d9ca0dd3d23b4db7f2d1076... Author: julianladisch github.com-t3if@ladisch.de Date: 2014-10-18 (Sat, 18 Oct 2014)
Changed paths: M po/de.po
Log Message: ----------- Translated using Weblate (German)
Currently translated at 100.0% (2768 of 2768 strings)
[CI skip]
Commit: ac27cd2026ec4ac0802d0ebf85f76ba317cb8bd7 https://github.com/phpmyadmin/phpmyadmin/commit/ac27cd2026ec4ac0802d0ebf85f7... Author: Tor Stokkan danorse@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 65.4% (1811 of 2768 strings)
[CI skip]
Commit: e67abc737a5c2031eea635e4017cf297a330f80a https://github.com/phpmyadmin/phpmyadmin/commit/e67abc737a5c2031eea635e4017c... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-19 (Sun, 19 Oct 2014)
Changed paths: M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
Log Message: ----------- Fix tests
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: af6e87f27885fe9b8008f3e63612508490799b29 https://github.com/phpmyadmin/phpmyadmin/commit/af6e87f27885fe9b8008f3e63612... Author: Giovanni Sora g.sora@tiscali.it Date: 2014-10-19 (Sun, 19 Oct 2014)
Changed paths: M po/ia.po
Log Message: ----------- Translated using Weblate (Interlingua)
Currently translated at 62.4% (1728 of 2768 strings)
[CI skip]
Commit: 331d89c0bcbaadd29ddac5db6c0ca35f6792a453 https://github.com/phpmyadmin/phpmyadmin/commit/331d89c0bcbaadd29ddac5db6c0c... Author: Tor Stokkan danorse@gmail.com Date: 2014-10-19 (Sun, 19 Oct 2014)
Changed paths: M po/nb.po
Log Message: ----------- Translated using Weblate (Norwegian Bokmål)
Currently translated at 65.4% (1813 of 2768 strings)
[CI skip]
Commit: 8186a0e462dbad074e8ec6fb90f14921ac095996 https://github.com/phpmyadmin/phpmyadmin/commit/8186a0e462dbad074e8ec6fb90f1... Author: Weblate noreply@weblate.org Date: 2014-10-19 (Sun, 19 Oct 2014)
Changed paths: M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: b75e19f8df919144a3febd21b0a3098e89d41ff6 https://github.com/phpmyadmin/phpmyadmin/commit/b75e19f8df919144a3febd21b0a3... Author: Marc Delisle marc@infomarc.info Date: 2014-10-21 (Tue, 21 Oct 2014)
Log Message: ----------- Merge commit '319aac3' into QA_4_2
Commit: 873ffa3ffed233754b69ba5df7a2ee3d8ea0025f https://github.com/phpmyadmin/phpmyadmin/commit/873ffa3ffed233754b69ba5df7a2... Author: Marc Delisle marc@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 conflict
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: d8d4a8062aea09023d3950691a5a8ce1312ab1a4 https://github.com/phpmyadmin/phpmyadmin/commit/d8d4a8062aea09023d3950691a5a... Author: Marc Delisle marc@infomarc.info Date: 2014-10-21 (Tue, 21 Oct 2014)
Log Message: ----------- Merge commit 'd0e3ab3' into QA_4_2
Commit: 4e7fbc287c0cb366b41ffecf9af667b67778cf1c https://github.com/phpmyadmin/phpmyadmin/commit/4e7fbc287c0cb366b41ffecf9af6... Author: josep constanti jconstanti@ovi.com Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M po/ca.po
Log Message: ----------- Translated using Weblate (Catalan)
Currently translated at 88.3% (2446 of 2768 strings)
[CI skip]
Commit: a5516f3b3470d94328bda52376811926d77cddef https://github.com/phpmyadmin/phpmyadmin/commit/a5516f3b3470d94328bda5237681... Author: Weblate noreply@weblate.org 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: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: e28912d49e50071cba9632047ed3704f57d4c652 https://github.com/phpmyadmin/phpmyadmin/commit/e28912d49e50071cba9632047ed3... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M ChangeLog M libraries/core.lib.php
Log Message: ----------- bug #4557 PHP fatal error, undefined function __()
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: 1e21d7b0dad85dac0e1ca8c6852510e2d178e2dc https://github.com/phpmyadmin/phpmyadmin/commit/1e21d7b0dad85dac0e1ca8c68525... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-21 (Tue, 21 Oct 2014)
Changed paths: M ChangeLog M js/tbl_chart.js
Log Message: ----------- bug #4568 Date displayed incorrectly when charting a timeline
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: e6c3f10d722b2a10745b33a21c8ec3a27f5de183 https://github.com/phpmyadmin/phpmyadmin/commit/e6c3f10d722b2a10745b33a21c8e... Author: Marc Delisle marc@infomarc.info Date: 2014-10-23 (Thu, 23 Oct 2014)
Changed paths: M ChangeLog M server_privileges.php
Log Message: ----------- bug #4571 Database Privileges link does not work
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 92ef2afd6f18129e62fe06a7ac0ed0aaced94849 https://github.com/phpmyadmin/phpmyadmin/commit/92ef2afd6f18129e62fe06a7ac0e... Author: Dennis Jakobsen dennis.jakobsen@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 100.0% (2768 of 2768 strings)
[CI skip]
Commit: 12b7effa0cb3dfa790f58df1ce93f321fb2d67d2 https://github.com/phpmyadmin/phpmyadmin/commit/12b7effa0cb3dfa790f58df1ce93... Author: Eyal Visoker visokereyal@gmail.com Date: 2014-10-23 (Thu, 23 Oct 2014)
Changed paths: M po/he.po
Log Message: ----------- Translated using Weblate (Hebrew)
Currently translated at 21.4% (595 of 2768 strings)
[CI skip]
Commit: 7ec994435507f935dea1977403e6876687969ebc https://github.com/phpmyadmin/phpmyadmin/commit/7ec994435507f935dea1977403e6... Author: Ion Adrian-Ionut john@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 62.4% (1729 of 2768 strings)
[CI skip]
Commit: 2a67e3340de5cd77dd76e569cb57a97580fd9c0a https://github.com/phpmyadmin/phpmyadmin/commit/2a67e3340de5cd77dd76e569cb57... Author: Weblate noreply@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/QA_4_2' into QA_4_2
Commit: 1e51819d6ea46b211892c38e42d047a1b126b7f1 https://github.com/phpmyadmin/phpmyadmin/commit/1e51819d6ea46b211892c38e42d0... Author: Marc Delisle marc@infomarc.info Date: 2014-10-25 (Sat, 25 Oct 2014)
Changed paths: M ChangeLog M js/makegrid.js
Log Message: ----------- bug in makegrid.js: where_clause is undefined
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 193d93e56d4755e073b0e70d631837fff65812e7 https://github.com/phpmyadmin/phpmyadmin/commit/193d93e56d4755e073b0e70d6318... Author: Fadhiil Rachman fadhiilrachman@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 78.6% (2176 of 2768 strings)
[CI skip]
Commit: 347d345942e0c73ddb3cd058496707bc69c0e014 https://github.com/phpmyadmin/phpmyadmin/commit/347d345942e0c73ddb3cd0584967... Author: Weblate noreply@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/QA_4_2' into QA_4_2
Commit: 2b4ed225054fb331ac36ab5ef5040b0f4174d206 https://github.com/phpmyadmin/phpmyadmin/commit/2b4ed225054fb331ac36ab5ef504... Author: Marc Delisle marc@infomarc.info Date: 2014-10-28 (Tue, 28 Oct 2014)
Changed paths: M ChangeLog M import.php
Log Message: ----------- bug #4572 missing trailing slash (import and open_basedir)
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 0b7559aaf5c40157310b70468ac3f1611944684b https://github.com/phpmyadmin/phpmyadmin/commit/0b7559aaf5c40157310b70468ac3... Author: Dadan Setia da2n_s@yahoo.co.id Date: 2014-10-28 (Tue, 28 Oct 2014)
Changed paths: M po/id.po
Log Message: ----------- Translated using Weblate (Indonesian)
Currently translated at 79.8% (2210 of 2768 strings)
[CI skip]
Commit: 103ac4ac143c2d9b5c8cb51da9e6d82c0f801cc8 https://github.com/phpmyadmin/phpmyadmin/commit/103ac4ac143c2d9b5c8cb51da9e6... Author: Weblate noreply@weblate.org Date: 2014-10-28 (Tue, 28 Oct 2014)
Changed paths: M ChangeLog M import.php
Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2
Commit: 6cdf76bcea5540a7ddbbc84dd4dd18d6539bca3e https://github.com/phpmyadmin/phpmyadmin/commit/6cdf76bcea5540a7ddbbc84dd4dd... Author: Marc Delisle marc@infomarc.info Date: 2014-10-31 (Fri, 31 Oct 2014)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.2.11 release
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: ce144165cf307f77309eafcc7c4c3084bd2a6628 https://github.com/phpmyadmin/phpmyadmin/commit/ce144165cf307f77309eafcc7c4c... Author: Marc Delisle marc@infomarc.info Date: 2014-10-31 (Fri, 31 Oct 2014)
Changed paths: M ChangeLog M README M doc/conf.py M import.php M js/makegrid.js M js/tbl_chart.js M libraries/Config.class.php M libraries/DatabaseInterface.class.php M libraries/Util.class.php M libraries/core.lib.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/rte/rte_events.lib.php M libraries/rte/rte_routines.lib.php M pmd_general.php M po/ar.po M po/bg.po M po/ca.po M po/da.po M po/de.po M po/gl.po M po/he.po M po/ia.po M po/id.po M po/lv.po M po/nb.po M po/ro.po M po/sv.po M po/tr.po M server_privileges.php M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
Log Message: ----------- Merge branch 'MAINT_4_2_11' into STABLE
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3720bf33b435...ce144165cf30