Branch: refs/heads/STABLE
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 22b36e3a13fd6443c0fa2d1d9c48405440159ff5
https://github.com/phpmyadmin/phpmyadmin/commit/22b36e3a13fd6443c0fa2d1d9c4…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-06-17 (Wed, 17 Jun 2015)
Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/Config.class.php
Log Message:
-----------
4.4.11-dev
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: afe5e692d23b68e59a3d30f95489f362e4942122
https://github.com/phpmyadmin/phpmyadmin/commit/afe5e692d23b68e59a3d30f9548…
Author: Tommy Surbakti <tommy(a)surbakti.net>
Date: 2015-06-17 (Wed, 17 Jun 2015)
Changed paths:
M po/id.po
Log Message:
-----------
Translated using Weblate (Indonesian)
Currently translated at 76.1% (2312 of 3035 strings)
[CI skip]
Commit: 98a3567a9ac4d00016d7a96e74dfad37ecdc7777
https://github.com/phpmyadmin/phpmyadmin/commit/98a3567a9ac4d00016d7a96e74d…
Author: Weblate <noreply(a)weblate.org>
Date: 2015-06-17 (Wed, 17 Jun 2015)
Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/Config.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4
Commit: a0beb6da88b88f8bcb4c64802fcb704c17cb6d06
https://github.com/phpmyadmin/phpmyadmin/commit/a0beb6da88b88f8bcb4c64802fc…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-24 (Wed, 24 Jun 2015)
Changed paths:
M ChangeLog
M js/pmd/history.js
M libraries/db_designer.lib.php
Log Message:
-----------
bug Missing selected/entered values when editing active options in visual query builder
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: b563d90593301b95bc3dc53fa20b29997bfc1d30
https://github.com/phpmyadmin/phpmyadmin/commit/b563d90593301b95bc3dc53fa20…
Author: Zrng Abdulla <zhyarabdulla94(a)gmail.com>
Date: 2015-06-24 (Wed, 24 Jun 2015)
Changed paths:
M po/ckb.po
Log Message:
-----------
Translated using Weblate (Kurdish Sorani)
Currently translated at 20.5% (624 of 3035 strings)
[CI skip]
Commit: 9edee922d42ae3dccdde404c79aa91e59303af77
https://github.com/phpmyadmin/phpmyadmin/commit/9edee922d42ae3dccdde404c79a…
Author: Sebastian <sebastian(a)sgundersen.com>
Date: 2015-06-24 (Wed, 24 Jun 2015)
Changed paths:
M po/nb.po
Log Message:
-----------
Translated using Weblate (Norwegian Bokmål)
Currently translated at 63.8% (1938 of 3035 strings)
[CI skip]
Commit: cb2c250478697eafcf61c1d454a8285fb2bb92fa
https://github.com/phpmyadmin/phpmyadmin/commit/cb2c250478697eafcf61c1d454a…
Author: Franco <fulanodetal.github(a)openaliasbox.org>
Date: 2015-06-24 (Wed, 24 Jun 2015)
Changed paths:
M po/es.po
Log Message:
-----------
Translated using Weblate (Spanish)
Currently translated at 99.9% (3033 of 3035 strings)
[CI skip]
Commit: c51e4fa388622a557a90727369e25239f6d7903a
https://github.com/phpmyadmin/phpmyadmin/commit/c51e4fa388622a557a90727369e…
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: 2015-06-24 (Wed, 24 Jun 2015)
Changed paths:
M po/tr.po
Log Message:
-----------
Translated using Weblate (Turkish)
Currently translated at 100.0% (3035 of 3035 strings)
[CI skip]
Commit: e2f0d39d61946eae2e30de624a17c083951319e2
https://github.com/phpmyadmin/phpmyadmin/commit/e2f0d39d61946eae2e30de624a1…
Author: Weblate <noreply(a)weblate.org>
Date: 2015-06-24 (Wed, 24 Jun 2015)
Changed paths:
M ChangeLog
M js/pmd/history.js
M libraries/db_designer.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4
Commit: e453cb818b7714e1b6231221c343660c5496ed7f
https://github.com/phpmyadmin/phpmyadmin/commit/e453cb818b7714e1b6231221c34…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-26 (Fri, 26 Jun 2015)
Changed paths:
M ChangeLog
M js/console.js
M libraries/user_preferences.lib.php
Log Message:
-----------
bug #4969 Autoload from prefs_storage not behaving properly
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: beaa73274f9bdb8b13339b407014454efc142267
https://github.com/phpmyadmin/phpmyadmin/commit/beaa73274f9bdb8b13339b40701…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-26 (Fri, 26 Jun 2015)
Changed paths:
M po/ckb.po
M po/es.po
M po/nb.po
M po/tr.po
Log Message:
-----------
Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4
Commit: b47b1dc2e6e8848fe53f31e86aded99a62364318
https://github.com/phpmyadmin/phpmyadmin/commit/b47b1dc2e6e8848fe53f31e86ad…
Author: Renato Rodrigues de Lima Júnio <renatomdd(a)yahoo.com.br>
Date: 2015-06-26 (Fri, 26 Jun 2015)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (3029 of 3035 strings)
[CI skip]
Commit: a3edd0b7ddb65f4de94fdaf240c80ff3ae74811e
https://github.com/phpmyadmin/phpmyadmin/commit/a3edd0b7ddb65f4de94fdaf240c…
Author: Weblate <noreply(a)weblate.org>
Date: 2015-06-26 (Fri, 26 Jun 2015)
Changed paths:
M ChangeLog
M js/console.js
M libraries/user_preferences.lib.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4
Commit: 2aea2b8902ecc7dce7165c3c52c7bc829c1b6beb
https://github.com/phpmyadmin/phpmyadmin/commit/2aea2b8902ecc7dce7165c3c52c…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-26 (Fri, 26 Jun 2015)
Changed paths:
M test/libraries/PMA_user_preferences_test.php
Log Message:
-----------
Update tests
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 9aa15746bc1b6e987a7a35267393b1d83a1e897d
https://github.com/phpmyadmin/phpmyadmin/commit/9aa15746bc1b6e987a7a3526739…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-06-26 (Fri, 26 Jun 2015)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4
Commit: a329b9c54b547d0ffd2bb388f4e443913ca14d32
https://github.com/phpmyadmin/phpmyadmin/commit/a329b9c54b547d0ffd2bb388f4e…
Author: Marco Pozzato <ironpotts(a)gmail.com>
Date: 2015-06-27 (Sat, 27 Jun 2015)
Changed paths:
M po/it.po
Log Message:
-----------
Translated using Weblate (Italian)
Currently translated at 99.9% (3032 of 3035 strings)
[CI skip]
Commit: 91d583cfe631a259dbf23fcfea48e1d3a24b3366
https://github.com/phpmyadmin/phpmyadmin/commit/91d583cfe631a259dbf23fcfea4…
Author: Renato Rodrigues de Lima Júnio <renatomdd(a)yahoo.com.br>
Date: 2015-06-27 (Sat, 27 Jun 2015)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (3035 of 3035 strings)
[CI skip]
Commit: b956fe723623f99cc21a608c9cb0ff255ffb8550
https://github.com/phpmyadmin/phpmyadmin/commit/b956fe723623f99cc21a608c9cb…
Author: Arben Çokaj <acokaj(a)shkoder.net>
Date: 2015-06-27 (Sat, 27 Jun 2015)
Changed paths:
M po/sq.po
Log Message:
-----------
Translated using Weblate (Albanian)
Currently translated at 100.0% (3035 of 3035 strings)
[CI skip]
Commit: 66b4be9b746da0c00d73959be8f892a2a5edbeee
https://github.com/phpmyadmin/phpmyadmin/commit/66b4be9b746da0c00d73959be8f…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-06-30 (Tue, 30 Jun 2015)
Changed paths:
M ChangeLog
M libraries/DisplayResults.class.php
M tbl_get_field.php
Log Message:
-----------
bug #4972 Incorrect length computed for binary data
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 64698e75050386d4132169751f8dcc0dcde8e3c3
https://github.com/phpmyadmin/phpmyadmin/commit/64698e75050386d4132169751f8…
Author: Arben Çokaj <acokaj(a)shkoder.net>
Date: 2015-06-30 (Tue, 30 Jun 2015)
Changed paths:
M po/sq.po
Log Message:
-----------
Translated using Weblate (Albanian)
Currently translated at 100.0% (3035 of 3035 strings)
[CI skip]
Commit: 781f917faf66692d1a7428c42f09906957b6414b
https://github.com/phpmyadmin/phpmyadmin/commit/781f917faf66692d1a7428c42f0…
Author: Valter Georgiev <blagynchy(a)gmail.com>
Date: 2015-06-30 (Tue, 30 Jun 2015)
Changed paths:
M po/bg.po
Log Message:
-----------
Translated using Weblate (Bulgarian)
Currently translated at 63.4% (1925 of 3035 strings)
[CI skip]
Commit: 593280fee548227b8604e9255301572d3681a221
https://github.com/phpmyadmin/phpmyadmin/commit/593280fee548227b8604e925530…
Author: Yaron Shahrabani <sh.yaron(a)gmail.com>
Date: 2015-06-30 (Tue, 30 Jun 2015)
Changed paths:
M po/he.po
Log Message:
-----------
Translated using Weblate (Hebrew)
Currently translated at 19.0% (577 of 3035 strings)
[CI skip]
Commit: 70eca3b6a72a923e8659dde8f32e8942062c32c2
https://github.com/phpmyadmin/phpmyadmin/commit/70eca3b6a72a923e8659dde8f32…
Author: Stefano Martinelli <stefano.ste.martinelli(a)gmail.com>
Date: 2015-06-30 (Tue, 30 Jun 2015)
Changed paths:
M po/it.po
Log Message:
-----------
Translated using Weblate (Italian)
Currently translated at 100.0% (3035 of 3035 strings)
[CI skip]
Commit: 777a8a00e1903fd7a47b11de256793282c3027df
https://github.com/phpmyadmin/phpmyadmin/commit/777a8a00e1903fd7a47b11de256…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-06-30 (Tue, 30 Jun 2015)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (3035 of 3035 strings)
[CI skip]
Commit: 498d5fc697e4611216bc4a9d55ffaef75b37a9de
https://github.com/phpmyadmin/phpmyadmin/commit/498d5fc697e4611216bc4a9d55f…
Author: Weblate <noreply(a)weblate.org>
Date: 2015-06-30 (Tue, 30 Jun 2015)
Changed paths:
M ChangeLog
M libraries/DisplayResults.class.php
M tbl_get_field.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4
Commit: 626487f86599e78b52232a5bd5a264b69dc1a595
https://github.com/phpmyadmin/phpmyadmin/commit/626487f86599e78b52232a5bd5a…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-07-02 (Thu, 02 Jul 2015)
Changed paths:
M ChangeLog
M sql/create_tables_drizzle.sql
Log Message:
-----------
Remove character set from create_tables_drizzle.sql
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: 069d6d9eb30e51e972891ebc0b3fb3fb6218585c
https://github.com/phpmyadmin/phpmyadmin/commit/069d6d9eb30e51e972891ebc0b3…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-07-02 (Thu, 02 Jul 2015)
Changed paths:
M ChangeLog
M libraries/server_privileges.lib.php
Log Message:
-----------
bug #4973 Users overview needs clarification
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: a6fd4c2ed4479415e6819e543155447bc662a71d
https://github.com/phpmyadmin/phpmyadmin/commit/a6fd4c2ed4479415e6819e54315…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2015-07-02 (Thu, 02 Jul 2015)
Changed paths:
M CONTRIBUTING.md
M README
M README.rst
M changelog.php
M composer.json
M doc/developers.rst
M doc/faq.rst
M doc/intro.rst
M doc/other.rst
M doc/setup.rst
M examples/swekey.sample.conf
M index.php
M libraries/Util.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/swekey/swekey.auth.lib.php
M libraries/plugins/export/ExportXml.class.php
M setup/frames/index.inc.php
M themes.php
Log Message:
-----------
Cleanup URLs to our website
- use https everywhere
- follow redirects on renamed pages
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: 4404f28d4b3edc7f480bfb6adb6b1a47e7a44e00
https://github.com/phpmyadmin/phpmyadmin/commit/4404f28d4b3edc7f480bfb6adb6…
Author: Michal Čihař <michal(a)cihar.com>
Date: 2015-07-02 (Thu, 02 Jul 2015)
Changed paths:
M composer.json
M doc/faq.rst
M setup/frames/index.inc.php
Log Message:
-----------
Replace some links to sourceforge.net with our website
- donations are no longer processed by sf.net
- support forums are disabled for years, point users to support page
Signed-off-by: Michal Čihař <michal(a)cihar.com>
Commit: ee650720cba47483ba502222dd442a683fca5d02
https://github.com/phpmyadmin/phpmyadmin/commit/ee650720cba47483ba502222dd4…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-07-04 (Sat, 04 Jul 2015)
Changed paths:
M ChangeLog
M js/console.js
Log Message:
-----------
bug #4974 Creating a database from console doesn't update navigation panel
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 6d4aac0853075e9c823bba39d142f928cbc3fa51
https://github.com/phpmyadmin/phpmyadmin/commit/6d4aac0853075e9c823bba39d14…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-07-05 (Sun, 05 Jul 2015)
Changed paths:
M ChangeLog
M doc/faq.rst
Log Message:
-----------
bug #4844 FAQ 1.17 needs an update
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: ece5e60ab1052b765418f238e29c7344a09261eb
https://github.com/phpmyadmin/phpmyadmin/commit/ece5e60ab1052b765418f238e29…
Author: Deven Bansod <devenbansod.bits(a)gmail.com>
Date: 2015-07-05 (Sun, 05 Jul 2015)
Changed paths:
M doc/faq.rst
Log Message:
-----------
Fixed some spelling mistakes
Signed-off-by: Deven Bansod <devenbansod.bits(a)gmail.com>
Commit: 937be53dc968f19213eadd25528b596bc5441639
https://github.com/phpmyadmin/phpmyadmin/commit/937be53dc968f19213eadd25528…
Author: Isaac Bennetch <bennetch(a)gmail.com>
Date: 2015-07-05 (Sun, 05 Jul 2015)
Changed paths:
M doc/faq.rst
Log Message:
-----------
Merge branch 'fix_errors_docs' of https://github.com/devenbansod/phpmyadmin into QA_4_4
Commit: b0d60e271a6f47d2e0ecd81ad620b5d185acc0b1
https://github.com/phpmyadmin/phpmyadmin/commit/b0d60e271a6f47d2e0ecd81ad62…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/Config.class.php
Log Message:
-----------
4.4.11 release
Signed-off-by: Marc Delisle <marc(a)infomarc.info>
Commit: 92587b25c316713738c1eb0c0fd9a4dff74c49d2
https://github.com/phpmyadmin/phpmyadmin/commit/92587b25c316713738c1eb0c0fd…
Author: Marc Delisle <marc(a)infomarc.info>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M CONTRIBUTING.md
M ChangeLog
M README
M README.rst
M changelog.php
M composer.json
M doc/conf.py
M doc/developers.rst
M doc/faq.rst
M doc/intro.rst
M doc/other.rst
M doc/setup.rst
M examples/swekey.sample.conf
M index.php
M js/console.js
M js/pmd/history.js
M libraries/Config.class.php
M libraries/DisplayResults.class.php
M libraries/Util.class.php
M libraries/db_designer.lib.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/swekey/swekey.auth.lib.php
M libraries/plugins/export/ExportXml.class.php
M libraries/server_privileges.lib.php
M libraries/user_preferences.lib.php
M po/bg.po
M po/ckb.po
M po/es.po
M po/he.po
M po/id.po
M po/it.po
M po/nb.po
M po/pt_BR.po
M po/sq.po
M po/tr.po
M setup/frames/index.inc.php
M sql/create_tables_drizzle.sql
M tbl_get_field.php
M test/libraries/PMA_user_preferences_test.php
M themes.php
Log Message:
-----------
Merge branch 'MAINT_4_4_11' into STABLE
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f996ad783053...92587b25c316
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 989199ee47dfa136b0dcbdf2f3beafbe1b62313c
https://github.com/phpmyadmin/phpmyadmin/commit/989199ee47dfa136b0dcbdf2f3b…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M js/chart.js
M js/tbl_chart.js
M templates/tbl_chart.phtml
Log Message:
-----------
bug saved chart image does not have a proper name or an extension
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: db898fb0b6c0aed0af28c817c821a014dde3ae39
https://github.com/phpmyadmin/phpmyadmin/commit/db898fb0b6c0aed0af28c817c82…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M ChangeLog
M js/chart.js
M js/tbl_chart.js
M libraries/tbl_chart.lib.php
Log Message:
-----------
bug - Saved chart image does not have a proper name or an extension
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: ecc886717dc1d908f86d63709aef1f5e70fa74a0
https://github.com/phpmyadmin/phpmyadmin/commit/ecc886717dc1d908f86d63709ae…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M CONTRIBUTING.md
M ChangeLog
M README
M README.rst
M changelog.php
M composer.json
M doc/conf.py
M doc/developers.rst
M doc/faq.rst
M doc/intro.rst
M doc/other.rst
M doc/setup.rst
M examples/swekey.sample.conf
M index.php
M js/console.js
M libraries/Config.class.php
M libraries/Util.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/swekey/swekey.auth.lib.php
M libraries/plugins/export/ExportXml.class.php
M libraries/server_privileges.lib.php
M setup/frames/index.inc.php
M themes.php
Log Message:
-----------
Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4
Conflicts:
ChangeLog
Commit: ef6bb181b764fc3b50801a69e5de1ad36fc0ffcc
https://github.com/phpmyadmin/phpmyadmin/commit/ef6bb181b764fc3b50801a69e5d…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Commit: fd2273922075a5d05c52d7c1c87b6f7e9fd9ea42
https://github.com/phpmyadmin/phpmyadmin/commit/fd2273922075a5d05c52d7c1c87…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5187c52fee2f...fd2273922075
Branch: refs/heads/QA_4_4
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: db898fb0b6c0aed0af28c817c821a014dde3ae39
https://github.com/phpmyadmin/phpmyadmin/commit/db898fb0b6c0aed0af28c817c82…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M ChangeLog
M js/chart.js
M js/tbl_chart.js
M libraries/tbl_chart.lib.php
Log Message:
-----------
bug - Saved chart image does not have a proper name or an extension
Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com>
Commit: ecc886717dc1d908f86d63709aef1f5e70fa74a0
https://github.com/phpmyadmin/phpmyadmin/commit/ecc886717dc1d908f86d63709ae…
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: 2015-07-06 (Mon, 06 Jul 2015)
Changed paths:
M CONTRIBUTING.md
M ChangeLog
M README
M README.rst
M changelog.php
M composer.json
M doc/conf.py
M doc/developers.rst
M doc/faq.rst
M doc/intro.rst
M doc/other.rst
M doc/setup.rst
M examples/swekey.sample.conf
M index.php
M js/console.js
M libraries/Config.class.php
M libraries/Util.class.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/auth/swekey/swekey.auth.lib.php
M libraries/plugins/export/ExportXml.class.php
M libraries/server_privileges.lib.php
M setup/frames/index.inc.php
M themes.php
Log Message:
-----------
Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4
Conflicts:
ChangeLog
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/daf61e11797b...ecc886717dc1