[Phpmyadmin-git] [phpmyadmin/phpmyadmin] b1855e: Fixed bug #3534121 - duplicate line in config.samp...

[Rouslan Placella]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b1855ec0b428ea8ba62f752e5fdca51c5b3881a9
      https://github.com/phpmyadmin/phpmyadmin/commit/b1855ec0b428ea8ba62f752e5fdca51c5b3881a9
  Author: Rouslan Placella <rouslan at placella.com>
  Date:   2012-06-10 (Sun, 10 Jun 2012)

  Changed paths:
    M ChangeLog
    M config.sample.inc.php

  Log Message:
  -----------
  Fixed bug #3534121 - duplicate line in config.sample.inc.php


  Commit: 8f698c7c82908e43f291e1969bf30b151bf94bd1
      https://github.com/phpmyadmin/phpmyadmin/commit/8f698c7c82908e43f291e1969bf30b151bf94bd1
  Author: Rouslan Placella <rouslan at placella.com>
  Date:   2012-06-10 (Sun, 10 Jun 2012)

  Changed paths:
    M ChangeLog
    M config.sample.inc.php

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5336e18...8f698c7