From: Anatol Belski <ab@php.net>
Date: Mon, 16 Mar 2015 07:34:14 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f898c07062aa441b006309fb7ece7c66dce9ae4;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  backport af2b0669 into 5.5
---

8f898c07062aa441b006309fb7ece7c66dce9ae4