]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorFerenc Kovacs <tyrael@php.net>
Mon, 18 Apr 2016 07:05:16 +0000 (09:05 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 18 Apr 2016 07:05:16 +0000 (09:05 +0200)
* PHP-7.0:
  mark frequent intermittent fpm test with XFAIL


Trivial merge