Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 232afd345e0c99545cce9e5d74415de5973a3993 https://github.com/phpmyadmin/phpmyadmin/commit/232afd345e0c99545cce9e5d7441... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2013-10-20 (Sun, 20 Oct 2013)

Changed paths: M libraries/tbl_relation.lib.php

Log Message: ----------- Properly show the error message

Commit: 10955bc7a90af405057b8c64a6b95d38a3999276 https://github.com/phpmyadmin/phpmyadmin/commit/10955bc7a90af405057b8c64a6b9... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2013-10-20 (Sun, 20 Oct 2013)

Changed paths: M libraries/import.lib.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8153535e4aec...10955bc7a90a