Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b87a8227e5c80d6da1c5552fb0879607e1937ed9 https://github.com/phpmyadmin/phpmyadmin/commit/b87a8227e5c80d6da1c5552fb087... Author: Marc Delisle marc@infomarc.info Date: 2014-01-06 (Mon, 06 Jan 2014)

Changed paths: M ChangeLog M libraries/browse_foreigners.lib.php

Log Message: ----------- bug #4220 Incorrect key values in foreign key browser

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

Commit: ce30242e55d5af8b5eea5f3653a59b403e328e50 https://github.com/phpmyadmin/phpmyadmin/commit/ce30242e55d5af8b5eea5f3653a5... Author: Douglas dreginatto douglas@reginatto.com Date: 2014-01-06 (Mon, 06 Jan 2014)

Changed paths: M po/pt_BR.po

Log Message: ----------- Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.6% (2740 of 2749)

Commit: 25a097f21de2c9f30101f2b7fea73a61d8837fa3 https://github.com/phpmyadmin/phpmyadmin/commit/25a097f21de2c9f30101f2b7fea7... Author: Weblate noreply@weblate.org Date: 2014-01-06 (Mon, 06 Jan 2014)

Changed paths: M ChangeLog M libraries/browse_foreigners.lib.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

Commit: 4c1e377638d4b407e8208b89709d666a9ee27217 https://github.com/phpmyadmin/phpmyadmin/commit/4c1e377638d4b407e8208b89709d... Author: Marc Delisle marc@infomarc.info Date: 2014-01-06 (Mon, 06 Jan 2014)

Log Message: ----------- Merge commit '25a097f'

Commit: 0a65267a570e0567f7fd327da4ce6afd6a91c054 https://github.com/phpmyadmin/phpmyadmin/commit/0a65267a570e0567f7fd327da4ce... Author: Marc Delisle marc@infomarc.info Date: 2014-01-06 (Mon, 06 Jan 2014)

Changed paths: M ChangeLog M libraries/browse_foreigners.lib.php

Log Message: ----------- Fix merge conflict

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e08c6fa711f7...0a65267a570e