From: Stanislav Malyshev <stas@php.net>
Date: Sun, 31 May 2015 04:18:50 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-7.0.0alpha1~67^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60c925fd41d954a23ca9b9387f02add2e77b37ec;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* 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
---

60c925fd41d954a23ca9b9387f02add2e77b37ec