From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 3 Jun 2012 22:01:50 +0000 (-0300)
Subject: Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' into PHP-5.4
X-Git-Tag: php-5.4.5RC1~74
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8779a9aad572618ce8aa94fc21479b63c471fef1;p=php

Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' into PHP-5.4
---

8779a9aad572618ce8aa94fc21479b63c471fef1