Branch: refs/heads/QA_4_3 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 209f9c6de767ed26fc9d4bc73c86a4a0f696c66c https://github.com/phpmyadmin/phpmyadmin/commit/209f9c6de767ed26fc9d4bc73c86... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-25 (Wed, 25 Feb 2015)

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

Log Message: ----------- bug #4778 SQL error when database list is sorted by additional columns

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

Commit: 7c75ee862e2047fb303d2ecd292c7aa1e96d36f4 https://github.com/phpmyadmin/phpmyadmin/commit/7c75ee862e2047fb303d2ecd292c... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-02-25 (Wed, 25 Feb 2015)

Changed paths: M po/ia.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b106c7d3504f...7c75ee862e20