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

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

8d3f4b647b0942273f477e5b7e1f3d5d26dc4e0d