From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 20 Oct 2013 10:52:31 +0000 (-0200)
Subject: Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
X-Git-Tag: php-5.5.6RC1~5^2~20^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6feabc8c64377f621448a65564bdf33d0de6866;p=php

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

b6feabc8c64377f621448a65564bdf33d0de6866