[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 66100f: bug #3541966 [config] Error in generated configura...

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 66100f67d7c8c0d0dcddcb4779f4feb2f4d79e3e
      https://github.com/phpmyadmin/phpmyadmin/commit/66100f67d7c8c0d0dcddcb4779f4feb2f4d79e3e
  Author: Alain ICHE <ichea at users.sourceforge.net>
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
    M ChangeLog
    M setup/lib/ConfigGenerator.class.php

  Log Message:
  -----------
  bug #3541966 [config] Error in generated configuration array


  Commit: 3ad443a6560188e4ce88fc732a86ee296fe14fcf
      https://github.com/phpmyadmin/phpmyadmin/commit/3ad443a6560188e4ce88fc732a86ee296fe14fcf
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
    M ChangeLog
    M setup/lib/ConfigGenerator.class.php

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


  Commit: 72cdb4d05861ef90c1201c10b9590c29cb01db29
      https://github.com/phpmyadmin/phpmyadmin/commit/72cdb4d05861ef90c1201c10b9590c29cb01db29
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
    M setup/lib/ConfigGenerator.class.php

  Log Message:
  -----------
  Simplify the logic a bit


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6fb2f8c37d46...72cdb4d05861