From: Felipe Pena <felipensp@gmail.com>
Date: Thu, 7 Jun 2012 17:21:10 +0000 (-0300)
Subject: - Fix merge
X-Git-Tag: php-5.4.5RC1~66
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78811586901e08e284120edf43c53c78451e4f91;p=php

- Fix merge
---

78811586901e08e284120edf43c53c78451e4f91