[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 3beef8: Merge branch 'master' of git://github.com/phpmyadm...

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 3beef89212a125eb01bfc1770c69ec1f832df4f1
      https://github.com/phpmyadmin/phpmyadmin/commit/3beef89212a125eb01bfc1770c69ec1f832df4f1
  Author: Michal Čihař <michal at cihar.com>
  Date:   2012-03-08 (Thu, 08 Mar 2012)

  Changed paths:
    M server_privileges.php

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/phpmyadmin/phpmyadmin