From: Felipe Pena <felipensp@gmail.com>
Date: Fri, 18 May 2012 22:38:52 +0000 (-0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-5.5.0alpha1~189
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b3b3d92290f6cae2ef056fe727f2ffad168f203;p=php

Merge branch 'master' of git.php.net:php-src
---

3b3b3d92290f6cae2ef056fe727f2ffad168f203