[Phpmyadmin-git] [phpmyadmin/phpmyadmin] b22b76: bug #4158 Events page says no privileges with ALL ...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b22b76e7f5201017928ef11b143cb7583b6c5a64
      https://github.com/phpmyadmin/phpmyadmin/commit/b22b76e7f5201017928ef11b143cb7583b6c5a64
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

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

  Log Message:
  -----------
  bug #4158 Events page says no privileges with ALL PRIVILEGES


  Commit: fbce9502e4c335241ed9462a72ae5383fe0ffb72
      https://github.com/phpmyadmin/phpmyadmin/commit/fbce9502e4c335241ed9462a72ae5383fe0ffb72
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

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

  Log Message:
  -----------
  Fix merge conflicts


  Commit: 20770f3f33ed44ef926a5feae895e8d10f2b6d6e
      https://github.com/phpmyadmin/phpmyadmin/commit/20770f3f33ed44ef926a5feae895e8d10f2b6d6e
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-11-27 (Wed, 27 Nov 2013)

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

  Log Message:
  -----------
  Merge branch 'QA_4_1'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/846d991d2a02...20770f3f33ed