From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 3 Jun 2012 22:02:00 +0000 (-0300)
Subject: Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57'
X-Git-Tag: php-5.5.0alpha1~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9434f5e41fd321e9e8a893451c6fabb3c658fa27;p=php

Merge commit 'e59b6dc0ae803d49c3f620818285f98dfb61fd57'
---

9434f5e41fd321e9e8a893451c6fabb3c658fa27