Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cd249f1cbe4e4baaaa21bba70eb919b71b9468b0 https://github.com/phpmyadmin/phpmyadmin/commit/cd249f1cbe4e4baaaa21bba70eb9... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-30 (Tue, 30 Dec 2014)

Changed paths: M ChangeLog M prefs_manage.php

Log Message: ----------- rfe #1572 User prefs: Diff-friendly JSON for config

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

Commit: f6a19c79cbb802fc8d8fa86fd4e7d26b59749afa https://github.com/phpmyadmin/phpmyadmin/commit/f6a19c79cbb802fc8d8fa86fd4e7... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-12-30 (Tue, 30 Dec 2014)

Changed paths: M ChangeLog M libraries/DisplayResults.class.php M po/sk.po M po/ta.po M po/th.po M test/classes/PMA_DisplayResults_test.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/315503c2b290...f6a19c79cbb8