[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 1a5b3f: 3.5.4 release

[Marc Delisle]

  Branch: refs/heads/QA_3_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 1a5b3f9867354a3c563a2479b1cda6bc89282ea9
      https://github.com/phpmyadmin/phpmyadmin/commit/1a5b3f9867354a3c563a2479b1cda6bc89282ea9
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

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

  Log Message:
  -----------
  3.5.4 release


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

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


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

  Changed paths:
    M ChangeLog

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ccb21c036598...eeee6df02f22