From: Tjerk Meesters <datibbaw@php.net>
Date: Sun, 2 Mar 2014 21:58:03 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta1~3^2~150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=330ffe2e244fd2bd7d1454bdaadea9875736cdd9;p=php

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

330ffe2e244fd2bd7d1454bdaadea9875736cdd9