Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 228f9c8de15a964fa5d4bec0cea036dfcd96a622 https://github.com/phpmyadmin/phpmyadmin/commit/228f9c8de15a964fa5d4bec0cea0... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-23 (Mon, 23 Feb 2015)

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

Log Message: ----------- bug #4760 Cannot re-import settings from local storage

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: bf428dc0ca945e4359ff28c7c2e48054901a5d3f https://github.com/phpmyadmin/phpmyadmin/commit/bf428dc0ca945e4359ff28c7c2e4... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-23 (Mon, 23 Feb 2015)

Changed paths: M ChangeLog M themes/pmahomme/css/common.css.php

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

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f2170d3bc6bb...bf428dc0ca94