]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Wed, 25 Mar 2015 09:33:39 +0000 (10:33 +0100)
committerRemi Collet <remi@php.net>
Wed, 25 Mar 2015 09:33:39 +0000 (10:33 +0100)
commit23336d77a61eecb1130b7dedb2cdc40b4f0c8eea
treea47b989e3def8ce6650a3e062cd23f8b1188505d
parent02be73b5fac63a02313b9fe0f204c65d4828edeb
parent3924548bcb6be47beeee348ed9b01ab2d64ae3a7
Merge branch 'PHP-5.6'

* PHP-5.6:
  revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
  Fixed typo
  Fixed typo