From: Stanislav Malyshev <stas@php.net>
Date: Mon, 4 Aug 2014 07:12:43 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~32^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12d76b8cce732564b806e928325c33ab050307bd;p=php

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

12d76b8cce732564b806e928325c33ab050307bd