From: Tjerk Meesters <datibbaw@php.net>
Date: Tue, 11 Mar 2014 11:16:13 +0000 (+0800)
Subject: Merge branch 'php-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~494^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffc0f8a16f4fa6a5414bf862b71bf85e451d4985;p=php

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

ffc0f8a16f4fa6a5414bf862b71bf85e451d4985