From: Tjerk Meesters <datibbaw@php.net>
Date: Tue, 8 Apr 2014 23:34:49 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta1~3^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2aba2494f5e9458760c8246ad1928074984a2766;p=php

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

2aba2494f5e9458760c8246ad1928074984a2766