]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Thu, 14 Mar 2013 13:39:47 +0000 (14:39 +0100)
committerAnatol Belski <ab@php.net>
Thu, 14 Mar 2013 13:39:47 +0000 (14:39 +0100)
commit96388c78c978101a84dc2ccc8b02948f0fb5999f
tree492efa4b48ac3ca38ee4b3fce6dd4868cb857f0c
parentdd1c358d1bf8fd492e39d46f93878d47a3b6d257
parent5df8cf19759c77ee05fe6eecba7088caecbe132e
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix zts check
ext/pcre/php_pcre.c