[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 404d82: 3.5.1-rc1

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 404d826e4fe5108a67e0a2b07341ab8378b3fe49
      https://github.com/phpmyadmin/phpmyadmin/commit/404d826e4fe5108a67e0a2b07341ab8378b3fe49
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Changed paths:
    M Documentation.html
    M README
    M libraries/Config.class.php

  Log Message:
  -----------
  3.5.1-rc1


  Commit: abf645b0a30f20b0f873d98820c1002ef6d36805
      https://github.com/phpmyadmin/phpmyadmin/commit/abf645b0a30f20b0f873d98820c1002ef6d36805
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Changed paths:
    M ChangeLog
    M Documentation.html
    M README
    M libraries/Config.class.php

  Log Message:
  -----------
  3.5.2-dev


  Commit: 715914a48d12bad828201899c723f04d5e296d5d
      https://github.com/phpmyadmin/phpmyadmin/commit/715914a48d12bad828201899c723f04d5e296d5d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Log Message:
  -----------
  Merge branch 'QA_3_5'


  Commit: b3a7232c86af323037ef0271f8be60fad6d6c341
      https://github.com/phpmyadmin/phpmyadmin/commit/b3a7232c86af323037ef0271f8be60fad6d6c341
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Changed paths:
    M ChangeLog

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0e35896...b3a7232