From: Stanislav Malyshev <stas@php.net>
Date: Sun, 31 May 2015 04:18:28 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.27RC1~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=930fb8b1f32437851b7a162a36cce56e5f54e4f9;p=php

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

930fb8b1f32437851b7a162a36cce56e5f54e4f9