[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 060a16: bug #3521313 [core] Call to undefined function __(...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 060a16f4481f50b071de8d8ae10198d18ca7de34
      https://github.com/phpmyadmin/phpmyadmin/commit/060a16f4481f50b071de8d8ae10198d18ca7de34
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-04-27 (Fri, 27 Apr 2012)

  Changed paths:
    M ChangeLog
    M libraries/Config.class.php

  Log Message:
  -----------
  bug #3521313 [core] Call to undefined function __()
(backport part of fix from 6a2afedda00446704ed6caa81cd85d34a4bb2bd9)


  Commit: 97bdb4c375273193f6391ff466dba756b64063e7
      https://github.com/phpmyadmin/phpmyadmin/commit/97bdb4c375273193f6391ff466dba756b64063e7
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-04-27 (Fri, 27 Apr 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_3_5'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/be4196a...97bdb4c