]> granicus.if.org Git - php/commit
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)
commit49662be30b005b1fcc8aa6a9d2535d0915d1970d
tree3dea3e1dfdba26a05dc3af2efd7215f47511f8f1
parent4c64bb27b1ac5f793c7e2eae721a8abee3c6f002
parent91e7b3b84f08a2fabed8ed2196a827e481a4b79c
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #50444: PDO-ODBC changes for 64-bit