]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 6 Feb 2015 18:05:13 +0000 (19:05 +0100)
committerAnatol Belski <ab@php.net>
Fri, 6 Feb 2015 18:05:13 +0000 (19:05 +0100)
* PHP-5.5:
  Fixed bug #68964 Allowed memory size exhausted with odbc_exec

1  2 
ext/odbc/config.m4

Simple merge