]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Sun, 22 Mar 2015 23:07:43 +0000 (00:07 +0100)
committerAnatol Belski <ab@php.net>
Sun, 22 Mar 2015 23:07:43 +0000 (00:07 +0100)
commit63d7cd7d5b9a8e94a0b6688ca21a0e7d3da9f132
tree7e46abcdcbf1c6e88fc2cffc47bf2303ffe5f143
parent7fce3607ea827d7e50bb4a8f0d1f1ecd71382c24
parenta759c40872a7287a5bef0e54b068695404566c88
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  cosmetic fix to default odbcver
  Remove extraneous strlen() call
ext/odbc/config.m4