From: Anatol Belski <ab@php.net>
Date: Tue, 28 Apr 2015 13:13:46 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.9RC1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b78f8220e7985c5851864ad9e79583c5df8cb045;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  updated NEWS
  Fixed bug #69381 out of memory with sage odbc driver
---

b78f8220e7985c5851864ad9e79583c5df8cb045