[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f0b2f2: Changelog entry 4144

[Atul Pratap Singh]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f0b2f264e155be841adaefc9ca99ab5d08b89b72
      https://github.com/phpmyadmin/phpmyadmin/commit/f0b2f264e155be841adaefc9ca99ab5d08b89b72
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2013-10-27 (Sun, 27 Oct 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Changelog entry 4144


  Commit: c2f48525dc8d48aaddd192794d88c8bba7f63aac
      https://github.com/phpmyadmin/phpmyadmin/commit/c2f48525dc8d48aaddd192794d88c8bba7f63aac
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2013-10-27 (Sun, 27 Oct 2013)

  Changed paths:
    M ChangeLog
    M js/functions.js
    M sql.php

  Log Message:
  -----------
  Fix bug#4059: Running delete query asks for confirmation but says it was already executed


  Commit: fd2ab2ea4058d350461caee8d0859a590cfa60b0
      https://github.com/phpmyadmin/phpmyadmin/commit/fd2ab2ea4058d350461caee8d0859a590cfa60b0
  Author: Atul Pratap Singh <atulpratapsingh05 at gmail.com>
  Date:   2013-10-27 (Sun, 27 Oct 2013)

  Changed paths:
    M ChangeLog
    M js/functions.js

  Log Message:
  -----------
  Merge branch 'QA_4_0'

Conflicts:
	sql.php


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/eff2e31c104f...fd2ab2ea4058