Merge branch 'PHP-5.2' into PHP-5.3

Browse Source

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.

...

This commit is contained in:

David Soria Parra 2012-03-19 06:11:40 -07:00

parent 227112cb0f f406858cc9

commit 3fd0b5f18a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available