]> granicus.if.org Git - php/commit
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)
commitc33aeb7d0641889997ca5b4be9ab9b963628d32a
tree4624767035f413021118c7cd0d3fcec58a0e6365
parent363a3218e24e89fbf5ae70948dd5368b519a5573
parent28bce7618a800afa42e55d7d626f4c05907a2eb0
Merge branch 'PHP-5.4'

* 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