[Phpmyadmin-git] [phpmyadmin/phpmyadmin] cff55c: removed to fix bug 4141

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cff55cd200c446cf87e10624b6d390cc97587a58
      https://github.com/phpmyadmin/phpmyadmin/commit/cff55cd200c446cf87e10624b6d390cc97587a58
  Author: Spun Nakandala <supun.nakandala at gmail.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M js/sql.js

  Log Message:
  -----------
  removed to fix bug 4141


  Commit: f3cc65590d76073307019cad33b147f59e28c537
      https://github.com/phpmyadmin/phpmyadmin/commit/f3cc65590d76073307019cad33b147f59e28c537
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M js/sql.js

  Log Message:
  -----------
  Merge pull request #753 from scnakandala/QA_4.0_Fixes

Bug Fix 4141


  Commit: 8ee7c6885989b2e439b29c381c6e20d4dfb54094
      https://github.com/phpmyadmin/phpmyadmin/commit/8ee7c6885989b2e439b29c381c6e20d4dfb54094
  Author: Lakshmanan M <send2lakshman at gmail.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M po/ta.po

  Log Message:
  -----------
  Translated using Weblate (Tamil)

Currently translated at 15.4% (404 of 2614)


  Commit: 2a9fa2a0160bab0e79345fd52eec09d742374293
      https://github.com/phpmyadmin/phpmyadmin/commit/2a9fa2a0160bab0e79345fd52eec09d742374293
  Author: Weblate <noreply at weblate.org>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M js/sql.js

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0


  Commit: dbed33bc25fcfb5812d6f42770bace266dbd7f7a
      https://github.com/phpmyadmin/phpmyadmin/commit/dbed33bc25fcfb5812d6f42770bace266dbd7f7a
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for second part of fix for bug #4141


  Commit: 9e8a9f8d5ce43e24ed30e6eccca60a5c31cb50ec
      https://github.com/phpmyadmin/phpmyadmin/commit/9e8a9f8d5ce43e24ed30e6eccca60a5c31cb50ec
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M js/sql.js

  Log Message:
  -----------
  Fix merge conflicts


  Commit: 6da69db4032012a77ff323ea9f5e6c4b43db3080
      https://github.com/phpmyadmin/phpmyadmin/commit/6da69db4032012a77ff323ea9f5e6c4b43db3080
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Log Message:
  -----------
  Merge commit '2a9fa2a'


  Commit: 87e2cbecf9b4df1755d294662c19890dfd300461
      https://github.com/phpmyadmin/phpmyadmin/commit/87e2cbecf9b4df1755d294662c19890dfd300461
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M ChangeLog

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b95a339413c3...87e2cbecf9b4