Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: c91a28be51bd919bfa26882a94bf28ab89cf4879 https://github.com/phpmyadmin/phpmyadmin/commit/c91a28be51bd919bfa26882a94bf... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-01-26 (Mon, 26 Jan 2015)

Changed paths: M ChangeLog M libraries/DisplayResults.class.php

Log Message: ----------- bug #4729 Display original field when using "Relational display column" option and display column is empty

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

Commit: 761a53ac0ac604caa1f283f9a2c7408e4d5793cf https://github.com/phpmyadmin/phpmyadmin/commit/761a53ac0ac604caa1f283f9a2c7... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-01-26 (Mon, 26 Jan 2015)

Changed paths: M po/bg.po M po/sk.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/68e10e89737f...761a53ac0ac6