From: Felipe Pena <felipensp@gmail.com>
Date: Thu, 19 Apr 2012 23:07:37 +0000 (-0300)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~284
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e104d3fb6eb390250597cd40d254cd5ffb9d3af8;p=php

Merge branch 'PHP-5.4'
---

e104d3fb6eb390250597cd40d254cd5ffb9d3af8