]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 363a321 28bce76)
Merge branch 'PHP-5.4'
authorDavid Soria Parra <dsp@php.net>
Wed, 21 Mar 2012 11:10:03 +0000 (12:10 +0100)
committerDavid Soria Parra <dsp@php.net>
Wed, 21 Mar 2012 11:10:03 +0000 (12:10 +0100)
* PHP-5.4:
  - update NEWS
  - add test for bug #55000 and #54374
  - merge fix bug #54374, bug #55500 - filter file names better, no dangling [s, svn revision 321664


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