Fix bug #67705 (extensive backtracking in rule regular expression)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67705 (extensive backtracking in rule regular expression)
add test
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add test
Fix bug #67705 (extensive backtracking in rule regular expression)
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  add test
  Fix bug #67705 (extensive backtracking in rule regular expression)

Conflicts:
	ext/fileinfo/data_file.c
	ext/fileinfo/libmagic/softmagic.c
	ext/fileinfo/magicdata.patch
backport the fix for bug #67739
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  backport the fix for bug #67739
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  backport the fix for bug #67739
Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference

Upstream https://bitbucket.org/libgd/gd-libgd/commits/463c3bd09bfe8e924e19acad7a2a6af16953a704

Notice: this fix don't manage monochrome/monovisual values
but just fix the security issue CVE-2014-2497
failing when trying to load such an image
NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
NEWS
typo
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  typo
typo
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  typo
  typo
typo