Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: e453cb818b7714e1b6231221c343660c5496ed7f https://github.com/phpmyadmin/phpmyadmin/commit/e453cb818b7714e1b6231221c343... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-06-26 (Fri, 26 Jun 2015)

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

Log Message: ----------- bug #4969 Autoload from prefs_storage not behaving properly

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

Commit: beaa73274f9bdb8b13339b407014454efc142267 https://github.com/phpmyadmin/phpmyadmin/commit/beaa73274f9bdb8b13339b407014... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-06-26 (Fri, 26 Jun 2015)

Changed paths: M po/ckb.po M po/es.po M po/nb.po M po/tr.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e2f0d39d6194...beaa73274f9b