From: Felipe Pena <felipensp@gmail.com>
Date: Thu, 7 Jun 2012 17:18:34 +0000 (-0300)
Subject: Merge commit '15213768e6cc098ab4e53cacc3b5eb86fa85284a' into PHP-5.3
X-Git-Tag: php-5.3.15RC1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=018a9b321fc1d405dacff7cba4c2623f4ec0fe51;p=php

Merge commit '15213768e6cc098ab4e53cacc3b5eb86fa85284a' into PHP-5.3
---

018a9b321fc1d405dacff7cba4c2623f4ec0fe51