Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e6f6dab3b096e78d8118b29495085753a9095d2d https://github.com/phpmyadmin/phpmyadmin/commit/e6f6dab3b096e78d8118b2949508... Author: Michal Čihař michal@cihar.com Date: 2014-06-25 (Wed, 25 Jun 2014)

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

Log Message: ----------- Fixed cookie based login for installations without mcrypt

bug #4469

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 18370fc63eb17b7bedd0112b46f746c3648574ca https://github.com/phpmyadmin/phpmyadmin/commit/18370fc63eb17b7bedd0112b46f7... Author: Giovanni Sora g.sora@tiscali.it Date: 2014-06-25 (Wed, 25 Jun 2014)

Changed paths: M po/ia.po

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

Currently translated at 54.5% (1512 of 2770)

Commit: 90a8a74afa54c0afba3b27169694d8ce77f83c6b https://github.com/phpmyadmin/phpmyadmin/commit/90a8a74afa54c0afba3b27169694... Author: Weblate noreply@weblate.org Date: 2014-06-25 (Wed, 25 Jun 2014)

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

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

Commit: 06b1ffc8da3ea4ca873f377dd34ea83e42448d30 https://github.com/phpmyadmin/phpmyadmin/commit/06b1ffc8da3ea4ca873f377dd34e... Author: Michal Čihař michal@cihar.com Date: 2014-06-25 (Wed, 25 Jun 2014)

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

Log Message: ----------- Fix comments

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 6620d0c193f9f748e7c263f5c6bb82d8b0de2cf9 https://github.com/phpmyadmin/phpmyadmin/commit/6620d0c193f9f748e7c263f5c6bb... Author: Michal Čihař michal@cihar.com Date: 2014-06-25 (Wed, 25 Jun 2014)

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_2'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f9c6a3b0c8bd...6620d0c193f9