[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 18bcce: Fixes bug #4803

[Marc Delisle]

  Branch: refs/heads/QA_4_4
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 18bccea2915d770a67812e0be9e5fded9166b159
      https://github.com/phpmyadmin/phpmyadmin/commit/18bccea2915d770a67812e0be9e5fded9166b159
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  Fixes bug #4803

Signed-off-by: Deven Bansod <devenbansod.bits at gmail.com>


  Commit: d5ae95d7ffe5976da1f44df34bb065c54173c895
      https://github.com/phpmyadmin/phpmyadmin/commit/d5ae95d7ffe5976da1f44df34bb065c54173c895
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  Merge pull request #1578 from devenbansod/QA_4_3

Fixes bug #4803


  Commit: 12e8654df065a7d395f5c159c27485320fe9004e
      https://github.com/phpmyadmin/phpmyadmin/commit/12e8654df065a7d395f5c159c27485320fe9004e
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: 31472e0cf03344c28b4e1e0fb0715a9262ada92b
      https://github.com/phpmyadmin/phpmyadmin/commit/31472e0cf03344c28b4e1e0fb0715a9262ada92b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M ChangeLog
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database.class.php

  Log Message:
  -----------
  Merge branch 'QA_4_3' into QA_4_4


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ceb94674f60b...31472e0cf033