Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4dda8970d1cd4fed2e96a9a298c977819aa81751 https://github.com/phpmyadmin/phpmyadmin/commit/4dda8970d1cd4fed2e96a9a298c9... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-01-03 (Fri, 03 Jan 2014)

Changed paths: M libraries/structure.lib.php

Log Message: ----------- Preserve table_type and table_group parameters when sorting

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

Commit: e792ff92880f21e02d2ead3aabe9c2772a949395 https://github.com/phpmyadmin/phpmyadmin/commit/e792ff92880f21e02d2ead3aabe9... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-01-03 (Fri, 03 Jan 2014)

Changed paths: M libraries/structure.lib.php

Log Message: ----------- Merge branch 'QA_4_1'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5c0329034b55...e792ff92880f