]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Sun, 8 Jan 2017 19:03:10 +0000 (19:03 +0000)
committerJoe Watkins <krakjoe@php.net>
Sun, 8 Jan 2017 19:03:10 +0000 (19:03 +0000)
* PHP-7.0:
  improve FPM tests (mostly for systemd build)


Trivial merge