From: Anatol Belski <ab@php.net>
Date: Thu, 11 Jun 2015 10:07:32 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.11RC1~13^2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b19790ab34ab7cb507f7ef43002c50bce31bafd2;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  added test for bug #69646
---

b19790ab34ab7cb507f7ef43002c50bce31bafd2