]> granicus.if.org Git - php/commit
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)
commit2635408a0d2bafe7dbeafab58fa6d046b706bf97
tree25201c2dd86e1bfe84f5056655d5ad331b1fa400
parentb65d4d1cfc35af5aa43802501b3b50a81754b657
parent4e46a873923b9a608cd2cdcef98ec7faad749d0e
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed PCRE locale crash in Windows/TS
ext/pcre/php_pcre.c