Browse Source

Merge branch 'PHP-5.2' into PHP-5.3

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.
pull/12/head
David Soria Parra 15 years ago
parent
commit
3fd0b5f18a

Diff Content Not Available