[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 157154: bug #3885 Additional fix for this bug

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 157154f20d590ebc6090fad9854921540abff42d
      https://github.com/phpmyadmin/phpmyadmin/commit/157154f20d590ebc6090fad9854921540abff42d
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-01-03 (Fri, 03 Jan 2014)

  Changed paths:
    M ChangeLog
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  bug #3885 Additional fix for this bug

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


  Commit: 870561686d5a5c8c9f68af5900b816ce09b74b1c
      https://github.com/phpmyadmin/phpmyadmin/commit/870561686d5a5c8c9f68af5900b816ce09b74b1c
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-01-03 (Fri, 03 Jan 2014)

  Changed paths:
    M ChangeLog
    M libraries/DisplayResults.class.php

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/83ec30c3e01b...870561686d5a