]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorDavid Soria Parra <dsp@php.net>
Wed, 21 Mar 2012 11:14:35 +0000 (12:14 +0100)
committerDavid Soria Parra <dsp@php.net>
Wed, 21 Mar 2012 11:14:35 +0000 (12:14 +0100)
commitf3f0ced4bbf119b55ae85002087484688d355f68
treefdb27576d2038858b04af7d2a2c9593f2808b0a5
parent9dcfb8c73fd639485182497ae5a8fc7d7ca7eb11
parentfda25d97ffa4e623b824aa70f0ba98e9eba88ef7
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - 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

Conflicts:
NEWS