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

Merge branch 'PHP-5.3' into 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.
---

dffd02903ae9e684d4db1666580e9a0d77c2c582