[Phpmyadmin-git] [phpmyadmin/phpmyadmin] c776e0: implementation of feature request #1423

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: c776e02e4474478429f9ba32d0d3286bd756f701
      https://github.com/phpmyadmin/phpmyadmin/commit/c776e02e4474478429f9ba32d0d3286bd756f701
  Author: Brad Jorgensen <brad.gnugget at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M libraries/config.values.php

  Log Message:
  -----------
  implementation of feature request #1423


  Commit: dd07a4a102be0e8607724cc808f9b361180eff15
      https://github.com/phpmyadmin/phpmyadmin/commit/dd07a4a102be0e8607724cc808f9b361180eff15
  Author: Brad Jorgensen <brad.gnugget at gmail.com>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  implementation of feature request #1423


  Commit: 51b7426263ca593ab780e46273474e54d15a4da2
      https://github.com/phpmyadmin/phpmyadmin/commit/51b7426263ca593ab780e46273474e54d15a4da2
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-05-17 (Fri, 17 May 2013)

  Changed paths:
    M ChangeLog
    M libraries/config.values.php

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/78e5e4dbeba9...51b7426263ca