[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cc0c82: 4.3.0-rc2 release

[Michal Čihař]

  Branch: refs/heads/QA_4_3
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cc0c82e2a3b3806ac4df76e89a3d52e4bf8d004d
      https://github.com/phpmyadmin/phpmyadmin/commit/cc0c82e2a3b3806ac4df76e89a3d52e4bf8d004d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

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

  Log Message:
  -----------
  4.3.0-rc2 release

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


  Commit: f9dc6be7e64e4853129a77ad2b04a08f4ec6bd3d
      https://github.com/phpmyadmin/phpmyadmin/commit/f9dc6be7e64e4853129a77ad2b04a08f4ec6bd3d
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  Add missing call to test

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: ccc239040f7f222c6c71cde3eda316eceecff16c
      https://github.com/phpmyadmin/phpmyadmin/commit/ccc239040f7f222c6c71cde3eda316eceecff16c
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

  Log Message:
  -----------
  Adjust testcase to new split methods

Signed-off-by: Michal Čihař <michal at cihar.com>

Conflicts:
	test/classes/plugin/auth/PMA_AuthenticationCookie_test.php


  Commit: 680352b372b52e011c4f207961837ba4f2b11faa
      https://github.com/phpmyadmin/phpmyadmin/commit/680352b372b52e011c4f207961837ba4f2b11faa
  Author: Michal Čihař <michal at cihar.com>
  Date:   2014-12-04 (Thu, 04 Dec 2014)

  Changed paths:
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php

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

Conflicts:
	README
	doc/conf.py
	libraries/Config.class.php


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6e71f2a72ad3...680352b372b5