Branch: refs/heads/QA_4_4 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8f58c8f851458b16cc34e9723b3789934c1a8080 https://github.com/phpmyadmin/phpmyadmin/commit/8f58c8f851458b16cc34e9723b37... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-27 (Fri, 27 Mar 2015)

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

Log Message: ----------- bug #4805 Inline edit broken when using functions in query

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

Commit: ebb613ab5155188e110cc8eb533ac8b67e903c01 https://github.com/phpmyadmin/phpmyadmin/commit/ebb613ab5155188e110cc8eb533a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-27 (Fri, 27 Mar 2015)

Changed paths: M po/ar.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/42ee547bb645...ebb613ab5155