From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 3 Jun 2012 22:00:49 +0000 (-0300)
Subject: Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' into PHP-5.3
X-Git-Tag: php-5.3.15RC1~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fc49c04df699b50c6d714d2505ddb5af06a12fd;p=php

Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57' into PHP-5.3
---

4fc49c04df699b50c6d714d2505ddb5af06a12fd