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

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

16ae4727696b29c9e3d2711be07be4f30be0bc6c