[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d162f4: Per server iv

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d162f4f3bd00ab0b2d928e25ff6db5453dc61791
      https://github.com/phpmyadmin/phpmyadmin/commit/d162f4f3bd00ab0b2d928e25ff6db5453dc61791
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  Per server iv

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


  Commit: 7714e86e74f690406316b789be0cfb13a8a331f5
      https://github.com/phpmyadmin/phpmyadmin/commit/7714e86e74f690406316b789be0cfb13a8a331f5
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  Merge pull request #1563 from madhuracj/rfe1561

Per server iv


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d47edaf6dccd...7714e86e74f6