From: Christoph M. Becker <cmb@php.net>
Date: Tue, 23 Jun 2015 15:32:47 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0alpha2~2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b29d822e0805fd6435c999a198fdf3e12702253f;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Moved NEWS entry for bug #69864 to proper category
  Moved NEWS entry for bug #69864 to proper category
---

b29d822e0805fd6435c999a198fdf3e12702253f