[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7dc42d: 4.2.9 release

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 7dc42d93af685393ed6a0f0dc435ae8388991b00
      https://github.com/phpmyadmin/phpmyadmin/commit/7dc42d93af685393ed6a0f0dc435ae8388991b00
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-09-20 (Sat, 20 Sep 2014)

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

  Log Message:
  -----------
  4.2.9 release

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


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

  Changed paths:
    M libraries/TableSearch.class.php
    M libraries/Util.class.php

  Log Message:
  -----------
  [security] XSS with malicious ENUM values

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

Conflicts:
	libraries/Util.class.php


  Commit: 304fb2b645b36a39e03b954fdbd567173ebe6448
      https://github.com/phpmyadmin/phpmyadmin/commit/304fb2b645b36a39e03b954fdbd567173ebe6448
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M libraries/TableSearch.class.php

  Log Message:
  -----------
  Bug 4544: additional fix for 4.2.x

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


  Commit: 822ac52395442ac1472901e4a73b6f2cbcef39b7
      https://github.com/phpmyadmin/phpmyadmin/commit/822ac52395442ac1472901e4a73b6f2cbcef39b7
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

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

  Log Message:
  -----------
  4.2.9.1 release

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


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

  Changed paths:
    M ChangeLog

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

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


  Commit: 70994d4cced7ff285bd32ed417018adfcd2d69ae
      https://github.com/phpmyadmin/phpmyadmin/commit/70994d4cced7ff285bd32ed417018adfcd2d69ae
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Changed paths:
    M ChangeLog

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5f8d08141108...70994d4cced7