[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0ec819: Bug fix #4400

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0ec8199ef74f9ecb4620e2eb44d870271b291a91
      https://github.com/phpmyadmin/phpmyadmin/commit/0ec8199ef74f9ecb4620e2eb44d870271b291a91
  Author: minhaz <minhazav at gmail.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M js/ajax.js

  Log Message:
  -----------
  Bug fix #4400

#Status: Fixed
Signed-off-by: A V Minhaz <minhazav at gmail.com>


  Commit: 9e4be8f5bc277c9c01ba522c6fe74265f65cc8ff
      https://github.com/phpmyadmin/phpmyadmin/commit/9e4be8f5bc277c9c01ba522c6fe74265f65cc8ff
  Author: minhaz <minhazav at gmail.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M js/ajax.js

  Log Message:
  -----------
  Removed trailing whitespace for bugfix#4400

Signed-off-by: A V Minhaz <minhazav at gmail.com>


  Commit: 665423047a687a112f2d71db28edf3eb481b7f88
      https://github.com/phpmyadmin/phpmyadmin/commit/665423047a687a112f2d71db28edf3eb481b7f88
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-15 (Thu, 15 May 2014)

  Changed paths:
    M js/ajax.js

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

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


  Commit: e114f7d4eadd6855f3784bd54ab814ad0de22753
      https://github.com/phpmyadmin/phpmyadmin/commit/e114f7d4eadd6855f3784bd54ab814ad0de22753
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-05-15 (Thu, 15 May 2014)

  Changed paths:
    M js/ajax.js

  Log Message:
  -----------
  Fix typos

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/86f6fb71aca8...e114f7d4eadd