]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Mon, 4 Mar 2013 08:15:17 +0000 (09:15 +0100)
committerAnatol Belski <ab@php.net>
Mon, 4 Mar 2013 08:15:17 +0000 (09:15 +0100)
* PHP-5.4:
  Fixed PCRE locale crash in Windows/TS

1  2 
ext/pcre/php_pcre.c

Simple merge