[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 30e0e3: bug #3921 Call to undefined function PMA_isSuperus...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 30e0e3648d90f349a119d9f53c94230fb7675210
      https://github.com/phpmyadmin/phpmyadmin/commit/30e0e3648d90f349a119d9f53c94230fb7675210
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M ChangeLog
    M index.php
    M libraries/Menu.class.php

  Log Message:
  -----------
  bug #3921 Call to undefined function PMA_isSuperuser() if default server is not set


  Commit: b7844a15043dbfaa01d47cb47a8f4a8fe42ebbf2
      https://github.com/phpmyadmin/phpmyadmin/commit/b7844a15043dbfaa01d47cb47a8f4a8fe42ebbf2
  Author: Yungu Kim <crimsonpi at gmail.com>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M po/ko.po

  Log Message:
  -----------
  Translated using Weblate (Korean)

Currently translated at 69.0% (1797 of 2603)


  Commit: c0617905252f14270ad9d98d34dac0e97bb21a43
      https://github.com/phpmyadmin/phpmyadmin/commit/c0617905252f14270ad9d98d34dac0e97bb21a43
  Author: Weblate <noreply at weblate.org>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M ChangeLog
    M index.php
    M libraries/Menu.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0


  Commit: 4a91c5753cda6168b999808871a5705fb1b7a00b
      https://github.com/phpmyadmin/phpmyadmin/commit/4a91c5753cda6168b999808871a5705fb1b7a00b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Changed paths:
    M ChangeLog
    M index.php
    M libraries/Menu.class.php

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


  Commit: 84c62cc6e8ada1549974ae0ebae5675f2480d9a6
      https://github.com/phpmyadmin/phpmyadmin/commit/84c62cc6e8ada1549974ae0ebae5675f2480d9a6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-06-08 (Sat, 08 Jun 2013)

  Log Message:
  -----------
  Merge commit 'c061790'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a75978d60025...84c62cc6e8ad