Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4d13f69f6a5123a68ad10853fe336220133b1a65 https://github.com/phpmyadmin/phpmyadmin/commit/4d13f69f6a5123a68ad10853fe33... Author: zz zz tczzjin@gmail.com Date: 2014-01-01 (Wed, 01 Jan 2014)

Changed paths: M po/zh_CN.po

Log Message: ----------- Translated using Weblate (Simplified Chinese)

Currently translated at 93.5% (2573 of 2749)

Commit: 8677cf510c593d997d26a8f19fe29e86b9d7e9ad https://github.com/phpmyadmin/phpmyadmin/commit/8677cf510c593d997d26a8f19fe2... Author: Weblate noreply@weblate.org Date: 2014-01-01 (Wed, 01 Jan 2014)

Changed paths: M ChangeLog M export.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

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

Commit: aecd5f7072793094fd091b9eba34bae652de341c https://github.com/phpmyadmin/phpmyadmin/commit/aecd5f7072793094fd091b9eba34... 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: ----------- Merge branch 'QA_4_1'

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/213d673bb053...aecd5f707279