]> granicus.if.org Git - php/commit
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)
commite46e208819f4ce18390d77131f79b5b498d59bb7
tree17b4d34cdb6d15a2a7a2186ace39e46b8cbeb864
parent63761ab91e57c33faf8a1053b431dd16d030970c
parenta41aa46759d20e23af92df00b917ca66c6102412
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #68964 Allowed memory size exhausted with odbc_exec
ext/odbc/config.m4