[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 782fe7: Merge commit 'd4f754c' into QA_4_2

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 782fe7a1e579f571111acaa852cb0d328aaaf119
      https://github.com/phpmyadmin/phpmyadmin/commit/782fe7a1e579f571111acaa852cb0d328aaaf119
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M libraries/RecentFavoriteTable.class.php
    M libraries/navigation/Navigation.class.php
    M libraries/navigation/Nodes/Node_DatabaseChild.class.php
    M libraries/structure.lib.php

  Log Message:
  -----------
  Merge commit 'd4f754c' into QA_4_2


  Commit: aea604f8508b47ce1331acd360a15ee5398ce809
      https://github.com/phpmyadmin/phpmyadmin/commit/aea604f8508b47ce1331acd360a15ee5398ce809
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M ChangeLog

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

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


  Commit: f1253cf31f75b60218aaed611faf7139f9cb19b2
      https://github.com/phpmyadmin/phpmyadmin/commit/f1253cf31f75b60218aaed611faf7139f9cb19b2
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  4.2.4 release

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


  Commit: 0ffa3766d1696d616e35c6c5d38375f44798017f
      https://github.com/phpmyadmin/phpmyadmin/commit/0ffa3766d1696d616e35c6c5d38375f44798017f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Log Message:
  -----------
  Merge commit 'aea604f'


  Commit: 88007a20bc7f03c5236a4900eba2e4f4c0bd17a2
      https://github.com/phpmyadmin/phpmyadmin/commit/88007a20bc7f03c5236a4900eba2e4f4c0bd17a2
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge branch 'QA_4_2'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9f37c3ddd7d8...88007a20bc7f