Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 822c4dfec2b59e77922cec6059b2831d803f0606 https://github.com/phpmyadmin/phpmyadmin/commit/822c4dfec2b59e77922cec6059b2... Author: Marc Delisle marc@infomarc.info Date: 2015-05-07 (Thu, 07 May 2015)

Changed paths: M ChangeLog M libraries/config/user_preferences.forms.php

Log Message: ----------- bug #4876 Settings issues (Favorite tables shown twice in Settings)

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

Commit: 2f180d2132b9546d1afd62fba929e079fde9b898 https://github.com/phpmyadmin/phpmyadmin/commit/2f180d2132b9546d1afd62fba929... Author: Marc Delisle marc@infomarc.info Date: 2015-05-07 (Thu, 07 May 2015)

Changed paths: M ChangeLog M libraries/config/user_preferences.forms.php

Log Message: ----------- Merge branch 'QA_4_4'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/375f6cb954c8...2f180d2132b9