[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 319aac: 4.2.10 release

[Marc Delisle]

  Branch: refs/heads/QA_4_2
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 319aac3c761142ab00e3e6016e594d4b84079efc
      https://github.com/phpmyadmin/phpmyadmin/commit/319aac3c761142ab00e3e6016e594d4b84079efc
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-11 (Sat, 11 Oct 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.2.10 release

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


  Commit: bd68c54d1beeef79d237e8bfda44690834012a76
      https://github.com/phpmyadmin/phpmyadmin/commit/bd68c54d1beeef79d237e8bfda44690834012a76
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

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

  Log Message:
  -----------
  bug #4562 [security] XSS in debug SQL output

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 7b8962dede7631298c81e2c1cd267b81f1e08a8c
      https://github.com/phpmyadmin/phpmyadmin/commit/7b8962dede7631298c81e2c1cd267b81f1e08a8c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M ChangeLog
    M js/server_status_monitor.js

  Log Message:
  -----------
  bug #4563 [security] XSS in monitor query analyzer

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: d0e3ab3bc9da5a4ed24e485632471fef65cdb556
      https://github.com/phpmyadmin/phpmyadmin/commit/d0e3ab3bc9da5a4ed24e485632471fef65cdb556
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.class.php

  Log Message:
  -----------
  4.2.10.1 release

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


  Commit: b75e19f8df919144a3febd21b0a3098e89d41ff6
      https://github.com/phpmyadmin/phpmyadmin/commit/b75e19f8df919144a3febd21b0a3098e89d41ff6
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Log Message:
  -----------
  Merge commit '319aac3' into QA_4_2


  Commit: 873ffa3ffed233754b69ba5df7a2ee3d8ea0025f
      https://github.com/phpmyadmin/phpmyadmin/commit/873ffa3ffed233754b69ba5df7a2ee3d8ea0025f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M ChangeLog
    M js/server_status_monitor.js
    M libraries/DatabaseInterface.class.php

  Log Message:
  -----------
  Fix merge conflict

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


  Commit: d8d4a8062aea09023d3950691a5a8ce1312ab1a4
      https://github.com/phpmyadmin/phpmyadmin/commit/d8d4a8062aea09023d3950691a5a8ce1312ab1a4
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8186a0e462db...d8d4a8062aea