Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b8b58486cc60c8c81d7b795382be425875cbf512 https://github.com/phpmyadmin/phpmyadmin/commit/b8b58486cc60c8c81d7b795382be... Author: Marc Delisle marc@infomarc.info Date: 2016-01-08 (Fri, 08 Jan 2016)

Changed paths: M ChangeLog M libraries/relation.lib.php

Log Message: ----------- Fixes #11804 Misleading message for configuration storage

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 8ef3213f09b3ca37da84493d2607b47cfa110c0c https://github.com/phpmyadmin/phpmyadmin/commit/8ef3213f09b3ca37da84493d2607... Author: Marc Delisle marc@infomarc.info Date: 2016-01-08 (Fri, 08 Jan 2016)

Changed paths: M ChangeLog M libraries/relation.lib.php

Log Message: ----------- Merge branch 'QA_4_5'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c6939e9e50ce...8ef3213f09b3