]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 9 May 2014 20:16:42 +0000 (22:16 +0200)
committerAnatol Belski <ab@php.net>
Fri, 9 May 2014 20:16:42 +0000 (22:16 +0200)
* PHP-5.5:
  Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream


Trivial merge