Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0ae77814a7b1f2f9fa08aac741b0157fe6393a1d https://github.com/phpmyadmin/phpmyadmin/commit/0ae77814a7b1f2f9fa08aac741b0... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-01-01 (Wed, 01 Jan 2014)

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

Log Message: ----------- bug #4208 Can't browse tables after sorting on columns with fieldnames that have a '-'

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

Commit: ca692d7f33bc68b2181f1f17f88e72837c451dcb https://github.com/phpmyadmin/phpmyadmin/commit/ca692d7f33bc68b2181f1f17f88e... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-01-01 (Wed, 01 Jan 2014)

Changed paths: M ChangeLog M export.php M po/zh_CN.po

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

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8677cf510c59...ca692d7f33bc