]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54f0d50 ca797ca)
Merge branch 'PHP-5.3' into PHP-5.4
authorDavid Soria Parra <dsp@php.net>
Wed, 21 Mar 2012 17:12:16 +0000 (18:12 +0100)
committerDavid Soria Parra <dsp@php.net>
Wed, 21 Mar 2012 17:12:16 +0000 (18:12 +0100)
* PHP-5.3:
  Use the NEWS merge driver if available


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