Branch: refs/heads/master
Home: https://github.com/phpmyadmin/error-reporting-server
Commit: b072513449b9523f34c46c6405112fde5d8fd053
https://github.com/phpmyadmin/error-reporting-server/commit/b072513449b9523…
Author: Mohamed Ashraf <mohamed.ashraf.213(a)gmail.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M app/webroot/js/custom.js
Log Message:
-----------
Fixed indentation to tabs from spaces for consistency
Commit: dd3d1a303cf0d5a6d16a01a969acf53a08cee7da
https://github.com/phpmyadmin/error-reporting-server/commit/dd3d1a303cf0d5a…
Author: Mohamed Ashraf <mohamed.ashraf.213(a)gmail.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M app/webroot/js/custom.js
Log Message:
-----------
Fixed bug where filtering was not being done correctly
Commit: 82dda93f33fcf4a596c95e0902175bad0331ac27
https://github.com/phpmyadmin/error-reporting-server/commit/82dda93f33fcf4a…
Author: Mohamed Ashraf <mohamed.ashraf.213(a)gmail.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M app/Config/Migration/1375798518_remove_unneeded_fields_form_reports.php
A app/Config/Migration/1376824296_add_extra_columns_to_incidents_table.php
M app/Controller/ReportsController.php
M app/Model/Incident.php
M app/View/Helper/IncidentsHelper.php
M app/View/Helper/ReportsHelper.php
M app/View/Incidents/view.ctp
M app/View/Layouts/default.ctp
M app/View/Reports/view.ctp
A app/webroot/css/shCore.css
A app/webroot/css/shThemeDefault.css
M app/webroot/js/custom.js
A app/webroot/js/g.pie-min.js
A app/webroot/js/g.raphael-min.js
A app/webroot/js/pie.js
A app/webroot/js/raphael-min.js
A app/webroot/js/shBrushJScript.js
A app/webroot/js/shBrushXml.js
A app/webroot/js/shCore.js
Log Message:
-----------
Merge remote-tracking branch 'phpma/master' into fixes
Conflicts:
app/webroot/js/custom.js
Commit: eecdeaf011fde7be2105499a2aa6a95e5fd75292
https://github.com/phpmyadmin/error-reporting-server/commit/eecdeaf011fde7b…
Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M app/webroot/js/custom.js
Log Message:
-----------
Merge pull request #15 from m0hamed/fixes
Fixes bugs that arised from previous pull request
Compare: https://github.com/phpmyadmin/error-reporting-server/compare/a2e63e7c23f0..…
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 5be9c2f61a32b9bdb6a12786a64f09a42354605a
https://github.com/phpmyadmin/phpmyadmin/commit/5be9c2f61a32b9bdb6a12786a64…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M test/libraries/PMA_sql_query_form_test.php
Log Message:
-----------
Fix typo
Commit: 9ffa71c78710b2b685f9495f67f43482bfb8a886
https://github.com/phpmyadmin/phpmyadmin/commit/9ffa71c78710b2b685f9495f67f…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/af.po
M po/az.po
M po/be.po
M po/be(a)latin.po
M po/bg.po
M po/bs.po
M po/ca.po
M po/cs.po
M po/da.po
M po/de.po
M po/el.po
M po/es.po
M po/et.po
M po/eu.po
M po/fi.po
M po/fr.po
M po/gl.po
M po/hr.po
M po/hu.po
M po/id.po
M po/it.po
M po/ka.po
M po/lt.po
M po/mk.po
M po/mn.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/sq.po
M po/sr.po
M po/sr(a)latin.po
M po/sv.po
M po/tr.po
M po/tt.po
M po/uk.po
M po/uz(a)latin.po
M po/zh_TW.po
Log Message:
-----------
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8cc24a58cdbf...9ffa71c78710
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 1035d7d7debbde88e8b06bd5b723a6219036df2d
https://github.com/phpmyadmin/phpmyadmin/commit/1035d7d7debbde88e8b06bd5b72…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/af.po
Log Message:
-----------
Translated using Weblate (Afrikaans)
Currently translated at 9.9% (269 of 2720)
Commit: 8d4cb4ed561c63846d4fa22a333caf4312e18dba
https://github.com/phpmyadmin/phpmyadmin/commit/8d4cb4ed561c63846d4fa22a333…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/sq.po
Log Message:
-----------
Translated using Weblate (Albanian)
Currently translated at 28.6% (778 of 2720)
Commit: faca67beadaf82782835ab8960cb21dc741bef0b
https://github.com/phpmyadmin/phpmyadmin/commit/faca67beadaf82782835ab8960c…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/az.po
Log Message:
-----------
Translated using Weblate (Azerbaijani)
Currently translated at 15.3% (416 of 2720)
Commit: 2b957cf0671c8631aea7098cf65ed7df535e27fe
https://github.com/phpmyadmin/phpmyadmin/commit/2b957cf0671c8631aea7098cf65…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/eu.po
Log Message:
-----------
Translated using Weblate (Basque)
Currently translated at 20.9% (568 of 2720)
Commit: d2ee86eb8fb7fdbaf609e86aa973a4a699ac3719
https://github.com/phpmyadmin/phpmyadmin/commit/d2ee86eb8fb7fdbaf609e86aa97…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/be.po
Log Message:
-----------
Translated using Weblate (Belarusian)
Currently translated at 31.8% (866 of 2720)
Commit: 844342f31c8357ff40e1e3218e1bc85aa17e8fda
https://github.com/phpmyadmin/phpmyadmin/commit/844342f31c8357ff40e1e3218e1…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/be(a)latin.po
Log Message:
-----------
Translated using Weblate (Belarusian (latin))
Currently translated at 31.8% (865 of 2720)
Commit: 815b43b2e2461b03fc0f5b6c0c6c010f58f0c499
https://github.com/phpmyadmin/phpmyadmin/commit/815b43b2e2461b03fc0f5b6c0c6…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/bs.po
Log Message:
-----------
Translated using Weblate (Bosnian)
Currently translated at 17.1% (466 of 2720)
Commit: bdc621c0e223c811bf28dfa89705d8967e7d6feb
https://github.com/phpmyadmin/phpmyadmin/commit/bdc621c0e223c811bf28dfa8970…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/bg.po
Log Message:
-----------
Translated using Weblate (Bulgarian)
Currently translated at 71.4% (1943 of 2720)
Commit: b08f6d4dddda15a928f3c82988970023645889d4
https://github.com/phpmyadmin/phpmyadmin/commit/b08f6d4dddda15a928f3c829889…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/ca.po
Log Message:
-----------
Translated using Weblate (Catalan)
Currently translated at 93.1% (2532 of 2720)
Commit: 03ea46e831f8ade1401558bdd93cfe5dd119370b
https://github.com/phpmyadmin/phpmyadmin/commit/03ea46e831f8ade1401558bdd93…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/hr.po
Log Message:
-----------
Translated using Weblate (Croatian)
Currently translated at 38.9% (1057 of 2720)
Commit: a2e198526a6ece9a195bd661e7d13672418306a8
https://github.com/phpmyadmin/phpmyadmin/commit/a2e198526a6ece9a195bd661e7d…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/cs.po
Log Message:
-----------
Translated using Weblate (Czech)
Currently translated at 100.0% (2720 of 2720)
Commit: a1d49bb2be276b063f540a7bb6129017b4f40289
https://github.com/phpmyadmin/phpmyadmin/commit/a1d49bb2be276b063f540a7bb61…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/da.po
Log Message:
-----------
Translated using Weblate (Danish)
Currently translated at 98.1% (2667 of 2720)
Commit: edaac7a1adee500db189bccb2cacf07b899deaf1
https://github.com/phpmyadmin/phpmyadmin/commit/edaac7a1adee500db189bccb2ca…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/nl.po
Log Message:
-----------
Translated using Weblate (Dutch)
Currently translated at 100.0% (2720 of 2720)
Commit: 30335cb2a0f648eaf39c74598eecc394263bb567
https://github.com/phpmyadmin/phpmyadmin/commit/30335cb2a0f648eaf39c74598ee…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/et.po
Log Message:
-----------
Translated using Weblate (Estonian)
Currently translated at 100.0% (2720 of 2720)
Commit: 5897b483d879531d4ce35f5ebf7a5bbb720b9964
https://github.com/phpmyadmin/phpmyadmin/commit/5897b483d879531d4ce35f5ebf7…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/fi.po
Log Message:
-----------
Translated using Weblate (Finnish)
Currently translated at 72.1% (1962 of 2720)
Commit: 6684ec85b63e678ae7c52fc3273ae9b5c3d1bb32
https://github.com/phpmyadmin/phpmyadmin/commit/6684ec85b63e678ae7c52fc3273…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/fr.po
Log Message:
-----------
Translated using Weblate (French)
Currently translated at 100.0% (2720 of 2720)
Commit: 8bceb177b602511cff3e86a6bf806ccb28f025b0
https://github.com/phpmyadmin/phpmyadmin/commit/8bceb177b602511cff3e86a6bf8…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/gl.po
Log Message:
-----------
Translated using Weblate (Galician)
Currently translated at 98.4% (2676 of 2720)
Commit: 0ccd9be59bfe58ff90503e3435d22c215ef4b16c
https://github.com/phpmyadmin/phpmyadmin/commit/0ccd9be59bfe58ff90503e3435d…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/ka.po
Log Message:
-----------
Translated using Weblate (Georgian)
Currently translated at 20.1% (548 of 2720)
Commit: 2be51b1b1d49a50a77f34157a95117d3b2c16769
https://github.com/phpmyadmin/phpmyadmin/commit/2be51b1b1d49a50a77f34157a95…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/de.po
Log Message:
-----------
Translated using Weblate (German)
Currently translated at 93.2% (2535 of 2720)
Commit: 5a932134079ef5251dff37da1d48440fafbea377
https://github.com/phpmyadmin/phpmyadmin/commit/5a932134079ef5251dff37da1d4…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/el.po
Log Message:
-----------
Translated using Weblate (Greek)
Currently translated at 100.0% (2720 of 2720)
Commit: 129a46ae94386cb623fe3f1bc95f84207e13725d
https://github.com/phpmyadmin/phpmyadmin/commit/129a46ae94386cb623fe3f1bc95…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/hu.po
Log Message:
-----------
Translated using Weblate (Hungarian)
Currently translated at 99.9% (2718 of 2720)
Commit: 7b2a5ed6847f95d4e317760477d1d600cabc61fa
https://github.com/phpmyadmin/phpmyadmin/commit/7b2a5ed6847f95d4e317760477d…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/id.po
Log Message:
-----------
Translated using Weblate (Indonesian)
Currently translated at 76.6% (2083 of 2720)
Commit: f60e12117fc380312d8ac9275575b16079c456b3
https://github.com/phpmyadmin/phpmyadmin/commit/f60e12117fc380312d8ac927557…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/it.po
Log Message:
-----------
Translated using Weblate (Italian)
Currently translated at 87.1% (2370 of 2720)
Commit: c98d508e80351c79e6be1eb10a5d43b6d1924e65
https://github.com/phpmyadmin/phpmyadmin/commit/c98d508e80351c79e6be1eb10a5…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/lt.po
Log Message:
-----------
Translated using Weblate (Lithuanian)
Currently translated at 62.6% (1702 of 2720)
Commit: d45d6fd5092a68b5b50bc9cafc0e70e1a8a7881f
https://github.com/phpmyadmin/phpmyadmin/commit/d45d6fd5092a68b5b50bc9cafc0…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/mk.po
Log Message:
-----------
Translated using Weblate (Macedonian)
Currently translated at 21.4% (583 of 2720)
Commit: 0268fd551584fa20a6b4b19cc017f2dd5d387966
https://github.com/phpmyadmin/phpmyadmin/commit/0268fd551584fa20a6b4b19cc01…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/mn.po
Log Message:
-----------
Translated using Weblate (Mongolian)
Currently translated at 25.6% (697 of 2720)
Commit: 8cae6c4567e43b0af348ec9ee94a03cd570bf371
https://github.com/phpmyadmin/phpmyadmin/commit/8cae6c4567e43b0af348ec9ee94…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/nb.po
Log Message:
-----------
Translated using Weblate (Norwegian Bokmål)
Currently translated at 67.1% (1825 of 2720)
Commit: 1b925a9acc7fe5bf26d542d4e04e60d2d228940f
https://github.com/phpmyadmin/phpmyadmin/commit/1b925a9acc7fe5bf26d542d4e04…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/pl.po
Log Message:
-----------
Translated using Weblate (Polish)
Currently translated at 92.8% (2524 of 2720)
Commit: df315839174bd5c87aa8c69fe788f1dad55b1a8a
https://github.com/phpmyadmin/phpmyadmin/commit/df315839174bd5c87aa8c69fe78…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/pt.po
Log Message:
-----------
Translated using Weblate (Portuguese)
Currently translated at 47.1% (1281 of 2720)
Commit: 127874211f48d70bb97a677a8a49d4d9f78cc739
https://github.com/phpmyadmin/phpmyadmin/commit/127874211f48d70bb97a677a8a4…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (2714 of 2720)
Commit: 014039fe3054de84973ee32fe8db3d51effeb116
https://github.com/phpmyadmin/phpmyadmin/commit/014039fe3054de84973ee32fe8d…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/ro.po
Log Message:
-----------
Translated using Weblate (Romanian)
Currently translated at 53.2% (1447 of 2720)
Commit: f89018c6958844930e11a908ecebc188d7549f16
https://github.com/phpmyadmin/phpmyadmin/commit/f89018c6958844930e11a908ece…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/ru.po
Log Message:
-----------
Translated using Weblate (Russian)
Currently translated at 97.3% (2647 of 2720)
Commit: 3dc0c18d9a3dcf85614752fb8b8c6b35e23c65a1
https://github.com/phpmyadmin/phpmyadmin/commit/3dc0c18d9a3dcf85614752fb8b8…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/sr.po
Log Message:
-----------
Translated using Weblate (Serbian)
Currently translated at 29.9% (814 of 2720)
Commit: fb51bf16b47dcdb6b7672fecb6c99ae1cee792ad
https://github.com/phpmyadmin/phpmyadmin/commit/fb51bf16b47dcdb6b7672fecb6c…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/sr(a)latin.po
Log Message:
-----------
Translated using Weblate (Serbian (latin))
Currently translated at 63.6% (1729 of 2720)
Commit: 96d785c9015474d9fb991c886a191d894608b89c
https://github.com/phpmyadmin/phpmyadmin/commit/96d785c9015474d9fb991c886a1…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/sk.po
Log Message:
-----------
Translated using Weblate (Slovak)
Currently translated at 77.8% (2116 of 2720)
Commit: 609dc057fabbda90b0dd4150b3cb6acf66533cc2
https://github.com/phpmyadmin/phpmyadmin/commit/609dc057fabbda90b0dd4150b3c…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/sl.po
Log Message:
-----------
Translated using Weblate (Slovenian)
Currently translated at 100.0% (2720 of 2720)
Commit: 08dafb54434689ca07ccd9796c06dea3aaf90c2a
https://github.com/phpmyadmin/phpmyadmin/commit/08dafb54434689ca07ccd9796c0…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/es.po
Log Message:
-----------
Translated using Weblate (Spanish)
Currently translated at 100.0% (2720 of 2720)
Commit: 576be32c63233ce9c03bb40ecc395269783c9417
https://github.com/phpmyadmin/phpmyadmin/commit/576be32c63233ce9c03bb40ecc3…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/sv.po
Log Message:
-----------
Translated using Weblate (Swedish)
Currently translated at 98.6% (2683 of 2720)
Commit: bba4da19e8d8ce1cb10be838b97d668e56042880
https://github.com/phpmyadmin/phpmyadmin/commit/bba4da19e8d8ce1cb10be838b97…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/tt.po
Log Message:
-----------
Translated using Weblate (Tatar)
Currently translated at 21.7% (591 of 2720)
Commit: c4f99835a187ba8770163e45fa3f77ebef4e0811
https://github.com/phpmyadmin/phpmyadmin/commit/c4f99835a187ba8770163e45fa3…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/zh_TW.po
Log Message:
-----------
Translated using Weblate (Traditional Chinese)
Currently translated at 99.7% (2712 of 2720)
Commit: c6b56fdf9f4189841b44e904cbc6ab314d37cecc
https://github.com/phpmyadmin/phpmyadmin/commit/c6b56fdf9f4189841b44e904cbc…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/tr.po
Log Message:
-----------
Translated using Weblate (Turkish)
Currently translated at 100.0% (2720 of 2720)
Commit: bd2fac8b6d8e4c0244d112de478c493e7f49ccb1
https://github.com/phpmyadmin/phpmyadmin/commit/bd2fac8b6d8e4c0244d112de478…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/uk.po
Log Message:
-----------
Translated using Weblate (Ukrainian)
Currently translated at 86.5% (2353 of 2720)
Commit: 617f63d4f14fd0c668e496157fae6855f286152e
https://github.com/phpmyadmin/phpmyadmin/commit/617f63d4f14fd0c668e496157fa…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M po/uz(a)latin.po
Log Message:
-----------
Translated using Weblate (Uzbek (latin))
Currently translated at 45.6% (1239 of 2720)
Commit: 8cc24a58cdbf49a7918e11d72aa6bb45ea7c427e
https://github.com/phpmyadmin/phpmyadmin/commit/8cc24a58cdbf49a7918e11d72aa…
Author: Weblate <noreply(a)weblate.org>
Date: 2013-08-23 (Fri, 23 Aug 2013)
Changed paths:
M libraries/bookmark.lib.php
A test/libraries/PMA_sql_query_form_test.php
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/99f5c4fe5bf6...8cc24a58cdbf