Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c576f9318033e0c2eefe2c93bfc3f0ed9237812d https://github.com/phpmyadmin/phpmyadmin/commit/c576f9318033e0c2eefe2c93bfc3... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-02-03 (Mon, 03 Feb 2014)

Changed paths: M ChangeLog M tbl_relation.php

Log Message: ----------- Fix bug 4269 Notice on table relation page

Commit: 71e7696325b0fb369714445049e724cb258a1653 https://github.com/phpmyadmin/phpmyadmin/commit/71e7696325b0fb369714445049e7... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-02-03 (Mon, 03 Feb 2014)

Changed paths: M po/si.po

Log Message: ----------- Translated using Weblate (Sinhala)

Currently translated at 78.3% (2154 of 2749)

Commit: f966a0c6519461859a50dd60bda98d6606e22056 https://github.com/phpmyadmin/phpmyadmin/commit/f966a0c6519461859a50dd60bda9... Author: Weblate noreply@weblate.org Date: 2014-02-03 (Mon, 03 Feb 2014)

Changed paths: M ChangeLog M tbl_relation.php

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

Commit: 36e544ce9ed59a0770c77b35869fea47445ad5dd https://github.com/phpmyadmin/phpmyadmin/commit/36e544ce9ed59a0770c77b35869f... Author: Marc Delisle marc@infomarc.info Date: 2014-02-03 (Mon, 03 Feb 2014)

Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php

Log Message: ----------- Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733

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

Commit: 71a1c4d301bbe3d2771ae9a5cb91fcf29fa6f9c2 https://github.com/phpmyadmin/phpmyadmin/commit/71a1c4d301bbe3d2771ae9a5cb91... Author: Ann + J.M phpMyAdmin@ZweiSteinSoft.de Date: 2014-02-03 (Mon, 03 Feb 2014)

Changed paths: M po/de.po

Log Message: ----------- Translated using Weblate (German)

Currently translated at 100.0% (2749 of 2749)

Commit: 28e64b9258cd2a90e339742ba36c20754720106b https://github.com/phpmyadmin/phpmyadmin/commit/28e64b9258cd2a90e339742ba36c... Author: Weblate noreply@weblate.org Date: 2014-02-03 (Mon, 03 Feb 2014)

Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php

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

Commit: 31076f46e88e15e849876875c411d7051ddef497 https://github.com/phpmyadmin/phpmyadmin/commit/31076f46e88e15e849876875c411... Author: Marc Delisle marc@infomarc.info Date: 2014-02-03 (Mon, 03 Feb 2014)

Log Message: ----------- Merge commit 'c576f93'

Commit: 837e8d8afcbcc7548893ec2185e586548c2cc83c https://github.com/phpmyadmin/phpmyadmin/commit/837e8d8afcbcc7548893ec2185e5... Author: Marc Delisle marc@infomarc.info Date: 2014-02-03 (Mon, 03 Feb 2014)

Log Message: ----------- Merge commit 'f966a0c'

Commit: 464616c26b50336a9ab189cb12ab726bc2d496b3 https://github.com/phpmyadmin/phpmyadmin/commit/464616c26b50336a9ab189cb12ab... Author: Marc Delisle marc@infomarc.info Date: 2014-02-03 (Mon, 03 Feb 2014)

Changed paths: M libraries/plugins/auth/AuthenticationCookie.class.php

Log Message: ----------- Merge commit '36e544c'

Commit: 326facb26dc896572594a88d36bae51aa835578a https://github.com/phpmyadmin/phpmyadmin/commit/326facb26dc896572594a88d36ba... Author: Marc Delisle marc@infomarc.info Date: 2014-02-03 (Mon, 03 Feb 2014)

Log Message: ----------- Merge commit '28e64b9'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cc92f25bc116...326facb26dc8