[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 60d22f: 3.5.4-rc1

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 60d22fcc463e8e9cd647e1ee1f1806d69ed95f00
      https://github.com/phpmyadmin/phpmyadmin/commit/60d22fcc463e8e9cd647e1ee1f1806d69ed95f00
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-11-08 (Thu, 08 Nov 2012)

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

  Log Message:
  -----------
  3.5.4-rc1


  Commit: 3fe37fdda0ecdc44e21a9955f9945d0f8a351308
      https://github.com/phpmyadmin/phpmyadmin/commit/3fe37fdda0ecdc44e21a9955f9945d0f8a351308
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-11-08 (Thu, 08 Nov 2012)

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


  Commit: aac68e0a25174c9ae20096814d9ed71c8ac0ec3a
      https://github.com/phpmyadmin/phpmyadmin/commit/aac68e0a25174c9ae20096814d9ed71c8ac0ec3a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-11-08 (Thu, 08 Nov 2012)

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

  Log Message:
  -----------
  3.5.5-dev


  Commit: cb990c96e4f5f7af6afa3759c4cc7895a7896b7b
      https://github.com/phpmyadmin/phpmyadmin/commit/cb990c96e4f5f7af6afa3759c4cc7895a7896b7b
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-11-08 (Thu, 08 Nov 2012)

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


  Commit: a170e0a960f7af79f344799b41f6366741044b78
      https://github.com/phpmyadmin/phpmyadmin/commit/a170e0a960f7af79f344799b41f6366741044b78
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-11-08 (Thu, 08 Nov 2012)

  Changed paths:
    M ChangeLog

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fe6124a555c3...a170e0a960f7