From: Tjerk Meesters <datibbaw@php.net>
Date: Fri, 7 Mar 2014 10:57:36 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta1~3^2~128
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64906cdc383f9350096ea3755ce71b5b01a80470;p=php

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

64906cdc383f9350096ea3755ce71b5b01a80470