[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7d8071: Merge remote-tracking branch 'origin/master'

6 Apr 2012


      Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 7d807131174fbd556726cd66972164918ea35380
      https://github.com/phpmyadmin/phpmyadmin/commit/7d807131174fbd556726cd669721...
  Author: Michal Čihař <weblate@l10n.cihar.com>
  Date:   2012-04-06 (Fri, 06 Apr 2012)

  Changed paths:
    M libraries/auth/cookie.auth.lib.php

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