]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Tue, 28 Apr 2015 13:13:46 +0000 (15:13 +0200)
committerAnatol Belski <ab@php.net>
Tue, 28 Apr 2015 13:13:46 +0000 (15:13 +0200)
* PHP-5.5:
  updated NEWS
  Fixed bug #69381 out of memory with sage odbc driver


Trivial merge