From: David Soria Parra <dsp@php.net>
Date: Mon, 19 Mar 2012 13:12:45 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~427
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b204f36eb32a5966a2d533305358977b048abf0d;p=php

Merge branch 'PHP-5.4'

This merge is a "fake". It was done with the merge strategy
"ours" to ensure Git thinks both branches are in sync after
the migration from SVN.
---

b204f36eb32a5966a2d533305358977b048abf0d