]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 31 May 2015 04:18:28 +0000 (21:18 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 31 May 2015 04:18:28 +0000 (21:18 -0700)
commit930fb8b1f32437851b7a162a36cce56e5f54e4f9
tree776e126827abe5cf9de2b4ea98838c8934b1f005
parent5683b6fa3962f483a407ca17d49397b203ed4145
parentf38ca75a3cc5737bdb922dc5e2a7505cd20cd7ea
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update PCRE version (bug #69689)
  move test
  NEWS 5.4
  fix new test
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  5.4.42 next

Conflicts:
configure.in
main/php_version.h
ext/pcre/pcrelib/config.h