From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 30 Jul 2013 23:04:00 +0000 (+0400)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~366^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5338bbbf38d0372aa3a4b7a0de8844997d10b481;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Added support for glob symbols in blacklist entries (?, *, **)

Conflicts:
	NEWS
---

5338bbbf38d0372aa3a4b7a0de8844997d10b481