From: Felipe Pena <felipensp@gmail.com>
Date: Sat, 30 Nov 2013 13:43:51 +0000 (-0200)
Subject: Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=841dddb3c25dc1a7ff2a274136eccc919447a0bf;p=php

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

841dddb3c25dc1a7ff2a274136eccc919447a0bf