Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: fda047361d81f73d1488b028e00c70fa9bf689b9 https://github.com/phpmyadmin/phpmyadmin/commit/fda047361d81f73d1488b028e00c... Author: Marc Delisle marc@infomarc.info Date: 2014-05-20 (Tue, 20 May 2014)

Changed paths: M libraries/relation.lib.php

Log Message: ----------- Fix notice

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

Commit: f027527c51ca590ad7eaf819b4af7ad1282166fb https://github.com/phpmyadmin/phpmyadmin/commit/f027527c51ca590ad7eaf819b4af... Author: Marc Delisle marc@infomarc.info Date: 2014-05-20 (Tue, 20 May 2014)

Changed paths: M libraries/relation.lib.php

Log Message: ----------- Merge branch 'QA_4_2'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8e99c1159f02...f027527c51ca