Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 53af6a569925cabd3d93763bc99eec38b2a883bd https://github.com/phpmyadmin/phpmyadmin/commit/53af6a569925cabd3d93763bc99e... Author: Michal Čihař michal@cihar.com Date: 2016-07-26 (Tue, 26 Jul 2016)

Changed paths: M libraries/Config.php M libraries/VersionInformation.php

Log Message: ----------- Simplify session handling on possibly long requests

We really do not have to reconfigure sessions on restarting them.

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 2f247ea46148333035dcc91bd46a6484827b2b0a https://github.com/phpmyadmin/phpmyadmin/commit/2f247ea46148333035dcc91bd46a... Author: Michal Čihař michal@cihar.com Date: 2016-07-26 (Tue, 26 Jul 2016)

Changed paths: M libraries/Config.php M libraries/VersionInformation.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3618801dfcb8...2f247ea46148