]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 27 May 2014 05:18:08 +0000 (22:18 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 27 May 2014 05:18:08 +0000 (22:18 -0700)
* PHP-5.5:
  Fix #50444: PDO-ODBC changes for 64-bit


Trivial merge