From: Felipe Pena <felipensp@gmail.com>
Date: Tue, 25 Jun 2013 21:01:40 +0000 (-0300)
Subject: Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
X-Git-Tag: php-5.5.2RC1~24^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b78f129a4a76037d8106300ce946de9971172a51;p=php

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

b78f129a4a76037d8106300ce946de9971172a51