[Phpmyadmin-git] [phpmyadmin/phpmyadmin] fe3a10: bug #4851 PHP errors in login dialogue

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: fe3a103767bd5f68a89d2527c29ad1f2bcffc54a
      https://github.com/phpmyadmin/phpmyadmin/commit/fe3a103767bd5f68a89d2527c29ad1f2bcffc54a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ChangeLog
    M libraries/common.inc.php

  Log Message:
  -----------
  bug #4851 PHP errors in login dialogue

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


  Commit: b398635e1a7e4e476eb0f3c88a180e7420271c5c
      https://github.com/phpmyadmin/phpmyadmin/commit/b398635e1a7e4e476eb0f3c88a180e7420271c5c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ChangeLog
    M libraries/common.inc.php

  Log Message:
  -----------
  Merge branch 'QA_4_4'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/51f317690e78...b398635e1a7e