Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ef3da7a79e7f3d9d1eed6470b0c03bbee7cf1028 https://github.com/phpmyadmin/phpmyadmin/commit/ef3da7a79e7f3d9d1eed6470b0c0... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-08-24 (Sun, 24 Aug 2014)

Changed paths: M test/classes/schema/Pdf_Relation_Schema_test.php

Log Message: ----------- Fix more failing tests

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

Commit: 6c6a25ea694f2f0b47a874e2639535d331e93cae https://github.com/phpmyadmin/phpmyadmin/commit/6c6a25ea694f2f0b47a874e26395... Author: Michal Čihař michal@cihar.com Date: 2014-08-25 (Mon, 25 Aug 2014)

Log Message: ----------- Merge remote-tracking branch 'weblate-master/master'

Conflicts: test/classes/schema/Pdf_Relation_Schema_test.php

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4e13d2270394...6c6a25ea694f