diff options
| author | David Soria Parra <dsp@php.net> | 2012-03-21 12:14:35 +0100 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2012-03-21 12:14:35 +0100 |
| commit | f3f0ced4bbf119b55ae85002087484688d355f68 (patch) | |
| tree | fdb27576d2038858b04af7d2a2c9593f2808b0a5 /ext | |
| parent | 9dcfb8c73fd639485182497ae5a8fc7d7ca7eb11 (diff) | |
| parent | fda25d97ffa4e623b824aa70f0ba98e9eba88ef7 (diff) | |
| download | php-git-f3f0ced4bbf119b55ae85002087484688d355f68.tar.gz | |
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
Diffstat (limited to 'ext')
0 files changed, 0 insertions, 0 deletions