]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.6:
  revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
  Fixed typo
  Fixed typo


Trivial merge