From: Felipe Pena <felipensp@gmail.com>
Date: Wed, 1 Jan 2014 11:56:31 +0000 (-0200)
Subject: Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~58^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49cdde7326c50a5861a0446d6c6647838447595a;p=php

Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
---

49cdde7326c50a5861a0446d6c6647838447595a