Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6baa646c74f041f3646017333eb86e414821f034 https://github.com/phpmyadmin/phpmyadmin/commit/6baa646c74f041f3646017333eb8... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)

Changed paths: M libraries/server_privileges.lib.php

Log Message: ----------- Check if the cfgrelation tables are actually set before using them

Fix #12760

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: 1ee52c8e4cf65e6cc2bc31ca7d07b291da60b2b8 https://github.com/phpmyadmin/phpmyadmin/commit/1ee52c8e4cf65e6cc2bc31ca7d07... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog for #12760

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: 9fdc05ce3818fbab3ef9ba185f000c8d6f57368f https://github.com/phpmyadmin/phpmyadmin/commit/9fdc05ce3818fbab3ef9ba185f00... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-29 (Tue, 29 Nov 2016)

Changed paths: M po/ja.po

Log Message: ----------- Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2d4c88ab1515...9fdc05ce3818