]> 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:09:53 +0000 (12:09 +0100)
committerDavid Soria Parra <dsp@php.net>
Wed, 21 Mar 2012 11:09:53 +0000 (12:09 +0100)
commit28bce7618a800afa42e55d7d626f4c05907a2eb0
tree6a0b5e4ea85c7a53a15231cfc7291837d9ea9c09
parentc918ca57a7233206ec78ac00438eeb6830e3680b
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
  adapt makedist to git

Conflicts:
NEWS