[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0306e2: Fix bug#4450 Query is duplicated on Ctrl+Enter

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0306e2bd887454fa4e200142416ea4dea2adbfd1
      https://github.com/phpmyadmin/phpmyadmin/commit/0306e2bd887454fa4e200142416ea4dea2adbfd1
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Fix bug#4450 Query is duplicated on Ctrl+Enter

Signed-off-by: Atul Pratap Singh <atulpratapsingh05 at gmail.com>


  Commit: 531fff09fe4ba8ae50022edfb35d5b6f3fdb8281
      https://github.com/phpmyadmin/phpmyadmin/commit/531fff09fe4ba8ae50022edfb35d5b6f3fdb8281
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M ChangeLog
    M import.php

  Log Message:
  -----------
  bug #4405 Cannot import (open_basedir): fix another case

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: f9d842fd725180237e594ab92f3b2586e5b7c1ba
      https://github.com/phpmyadmin/phpmyadmin/commit/f9d842fd725180237e594ab92f3b2586e5b7c1ba
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M js/functions.js

  Log Message:
  -----------
  Merge commit '0306e2b'


  Commit: 052eb0ecace01c5567840737d0b264cdd0965528
      https://github.com/phpmyadmin/phpmyadmin/commit/052eb0ecace01c5567840737d0b264cdd0965528
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M ChangeLog
    M import.php

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

Signed-off-by: Marc Delisle <marc at infomarc.info>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d909aa66b7f8...052eb0ecace0