]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorRemi Collet <remi@php.net>
Wed, 25 Mar 2015 09:33:31 +0000 (10:33 +0100)
committerRemi Collet <remi@php.net>
Wed, 25 Mar 2015 09:33:31 +0000 (10:33 +0100)
commit3924548bcb6be47beeee348ed9b01ab2d64ae3a7
tree95e766562e20569e0596e61d4fa8cdebea69365f
parenteb983666427f211408feb4faee7f4b5434db935e
parent1174b399ad325b630ba202abc6671d8055160b99
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared