]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Sun, 8 Mar 2015 06:37:07 +0000 (07:37 +0100)
committerRemi Collet <remi@php.net>
Sun, 8 Mar 2015 06:37:07 +0000 (07:37 +0100)
* PHP-5.6:
  Fix odbc build as shared


Trivial merge