]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 773bedb dffd029)
Merge branch 'PHP-5.4'
authorDavid Soria Parra <dsp@php.net>
Mon, 19 Mar 2012 13:12:45 +0000 (06:12 -0700)
committerDavid Soria Parra <dsp@php.net>
Mon, 19 Mar 2012 13:12:45 +0000 (06:12 -0700)
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.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.