]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Tue, 4 Feb 2014 09:31:52 +0000 (10:31 +0100)
committerAnatol Belski <ab@php.net>
Tue, 4 Feb 2014 09:31:52 +0000 (10:31 +0100)
* PHP-5.5:
  pcre upgraded to 8.34


Trivial merge