[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 743a52: rfe #1590 Recaptcha API v2

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 743a5288350596e067da2569abe5f663a79c4d67
      https://github.com/phpmyadmin/phpmyadmin/commit/743a5288350596e067da2569abe5f663a79c4d67
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M ChangeLog
    M libraries/Header.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    A libraries/plugins/auth/recaptcha/LICENSE
    A libraries/plugins/auth/recaptcha/recaptchalib.php
    R libraries/plugins/auth/recaptchalib.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  rfe #1590 Recaptcha API v2

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 8169ab1fe5cda279048461c5b7c14f403cc595ba
      https://github.com/phpmyadmin/phpmyadmin/commit/8169ab1fe5cda279048461c5b7c14f403cc595ba
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M ChangeLog
    M libraries/Header.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    A libraries/plugins/auth/recaptcha/LICENSE
    A libraries/plugins/auth/recaptcha/recaptchalib.php
    R libraries/plugins/auth/recaptchalib.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

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

Signed-off-by: Marc Delisle <marc at infomarc.info>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2ec944b824c1...8169ab1fe5cd