[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 274943: Fixed bug 4154

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 274943c0c5979b8f789ad15e949c1c7ff0af7577
      https://github.com/phpmyadmin/phpmyadmin/commit/274943c0c5979b8f789ad15e949c1c7ff0af7577
  Author: lakshit <lakshitarora26 at gmail.com>
  Date:   2013-12-08 (Sun, 08 Dec 2013)

  Changed paths:
    M libraries/sql.lib.php

  Log Message:
  -----------
  Fixed bug 4154

Signed-off-by: lakshit <lakshitarora26 at gmail.com>


  Commit: 6dccaa3b5bae9ec25363915fbf5ba00b1d5053ac
      https://github.com/phpmyadmin/phpmyadmin/commit/6dccaa3b5bae9ec25363915fbf5ba00b1d5053ac
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-08 (Sun, 08 Dec 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry for fix of bug #4154

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


  Commit: bb24ebc82ba36a2b3baddf6c15f6a55f6a2a562f
      https://github.com/phpmyadmin/phpmyadmin/commit/bb24ebc82ba36a2b3baddf6c15f6a55f6a2a562f
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2013-12-08 (Sun, 08 Dec 2013)

  Changed paths:
    M ChangeLog
    M libraries/sql.lib.php

  Log Message:
  -----------
  Merge branch 'QA_4_1'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8d1be739b005...bb24ebc82ba3