From: David Soria Parra <dsp@php.net>
Date: Wed, 21 Mar 2012 11:14:35 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: PHP-5.4.1-RC1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3f0ced4bbf119b55ae85002087484688d355f68;p=php

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
---

f3f0ced4bbf119b55ae85002087484688d355f68