Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 90b43c41adea4ad0164a73a088da372f9a9096e2 https://github.com/phpmyadmin/phpmyadmin/commit/90b43c41adea4ad0164a73a088da... Author: Marc Delisle marc@infomarc.info Date: 2015-01-16 (Fri, 16 Jan 2015)

Changed paths: M libraries/DisplayResults.class.php M test/classes/PMA_DisplayResults_test.php

Log Message: ----------- Remove dead code

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: 4fbcdcd6f7215e77bf575ea0d220ed807e68a54b https://github.com/phpmyadmin/phpmyadmin/commit/4fbcdcd6f7215e77bf575ea0d220... Author: Marc Delisle marc@infomarc.info Date: 2015-01-16 (Fri, 16 Jan 2015)

Changed paths: M po/ia.po

Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a409ef782560...4fbcdcd6f721