From: David Soria Parra <dsp@php.net>
Date: Mon, 16 Dec 2013 18:27:51 +0000 (-0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85a10166e138aa45a2d8f1786a3a7ca211c14982;p=php

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

85a10166e138aa45a2d8f1786a3a7ca211c14982