[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 3d196e: Fixes #11677. sql-parser and php-gettext collide.

[Dan Ungureanu]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 3d196ef57f5284370652f2d8fb4436a26fc5a99e
      https://github.com/phpmyadmin/phpmyadmin/commit/3d196ef57f5284370652f2d8fb4436a26fc5a99e
  Author: Dan Ungureanu <udan1107 at gmail.com>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M ChangeLog
    M libraries/sql-parser/autoload.php

  Log Message:
  -----------
  Fixes #11677. sql-parser and php-gettext collide.

Signed-off-by: Dan Ungureanu <udan1107 at gmail.com>


  Commit: 1960ab70b0bbb264a38ffeb4bd2cb15693e757fe
      https://github.com/phpmyadmin/phpmyadmin/commit/1960ab70b0bbb264a38ffeb4bd2cb15693e757fe
  Author: Dan Ungureanu <udan1107 at gmail.com>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M ChangeLog
    M libraries/sql-parser/autoload.php

  Log Message:
  -----------
  Merge branch 'QA_4_5' into QA_4_6


  Commit: ace5e8960bab494e8af6e3dffae19a244ebe531f
      https://github.com/phpmyadmin/phpmyadmin/commit/ace5e8960bab494e8af6e3dffae19a244ebe531f
  Author: Dan Ungureanu <udan1107 at gmail.com>
  Date:   2016-02-11 (Thu, 11 Feb 2016)

  Changed paths:
    M ChangeLog
    M libraries/sql-parser/autoload.php

  Log Message:
  -----------
  Merge branch 'QA_4_6'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8aea0eef0a09...ace5e8960bab