From: Anatol Belski <ab@php.net>
Date: Fri, 9 May 2014 20:16:42 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta3~2^2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c925c7a5b61685c40f15a9099afa1c645a719388;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
---

c925c7a5b61685c40f15a9099afa1c645a719388