From: Andrey Hristov <andrey@php.net>
Date: Mon, 10 Mar 2014 10:53:17 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta1~3^2~118
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8033ac2076bf4b4d66f8d350b4afc232a863419;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

c8033ac2076bf4b4d66f8d350b4afc232a863419