]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff30d03 930fb8b)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 31 May 2015 04:18:50 +0000 (21:18 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 31 May 2015 04:18:50 +0000 (21:18 -0700)
* PHP-5.5:
  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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.