]> granicus.if.org Git - php/commit
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)
commitc925c7a5b61685c40f15a9099afa1c645a719388
treea98f9fdaa238cfccb85e539dfb9497097da207ff
parenta3f09eb323986fa8e8c4c6e398071eedc6add02e
parentc62f32c3cc6e85a525dd959bd821c754b9c20e63
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