Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2936feaad23f361c708e7d3a66b8f63496b5ff66 https://github.com/phpmyadmin/phpmyadmin/commit/2936feaad23f361c708e7d3a66b8... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-07 (Tue, 07 Oct 2014)

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

Log Message: ----------- #4548 Inline editing a field converts tab to spaces

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

Commit: a82cb7aeae35d6f9ad5ffb95216a4b444ac020dc https://github.com/phpmyadmin/phpmyadmin/commit/a82cb7aeae35d6f9ad5ffb95216a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-10-07 (Tue, 07 Oct 2014)

Changed paths: M po/ru.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5db5f2a6d30b...a82cb7aeae35