]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 31 May 2015 04:19:05 +0000 (21:19 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 31 May 2015 04:19:05 +0000 (21:19 -0700)
commit66153ba153d5c9181403e63d95d71754c11f1c0b
tree4e15416f0e1b160bd33eabcaad86d97abbb6c9e6
parent9237a0de1cc40c4cc53c31a0396bf26249e1d5a9
parent60c925fd41d954a23ca9b9387f02add2e77b37ec
Merge branch 'PHP-5.6'

* PHP-5.6:
  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
ext/pcre/pcrelib/config.h