From: Ferenc Kovacs <tyrael@php.net>
Date: Mon, 18 Apr 2016 07:05:16 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~304
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1380a6c2fffb800778417f9c5560b040c9b8fc2f;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  mark frequent intermittent fpm test with XFAIL
---

1380a6c2fffb800778417f9c5560b040c9b8fc2f