Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b3a18956cfccddc99fdfd568a1602e808e9ab7b5 https://github.com/phpmyadmin/phpmyadmin/commit/b3a18956cfccddc99fdfd568a160... Author: Marc Delisle marc@infomarc.info Date: 2015-05-08 (Fri, 08 May 2015)

Changed paths: M test/libraries/PMA_FormDisplay_tpl_test.php

Log Message: ----------- Fix failing test

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

Commit: 4d02033f47e139e92a074eec701f629a00bfd6a8 https://github.com/phpmyadmin/phpmyadmin/commit/4d02033f47e139e92a074eec701f... Author: Marc Delisle marc@infomarc.info Date: 2015-05-08 (Fri, 08 May 2015)

Changed paths: M test/libraries/PMA_FormDisplay_tpl_test.php

Log Message: ----------- Merge branch 'QA_4_4'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7fd24d164495...4d02033f47e1