[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d26d26: bug #3521016 [edit] NOW() function incorrectly sel...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: d26d269a41f9653cf036873445b7c5edfd1b3800
      https://github.com/phpmyadmin/phpmyadmin/commit/d26d269a41f9653cf036873445b7c5edfd1b3800
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-05-01 (Tue, 01 May 2012)

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

  Log Message:
  -----------
  bug #3521016 [edit] NOW() function incorrectly selected


  Commit: d3a43a48dd0c6eac7749b206814853a048625ec9
      https://github.com/phpmyadmin/phpmyadmin/commit/d3a43a48dd0c6eac7749b206814853a048625ec9
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2012-05-01 (Tue, 01 May 2012)

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

  Log Message:
  -----------
  Merge branch 'QA_3_5'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ec9a8cf...d3a43a4