]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/2348' into PHP-7.0
authorJoe Watkins <krakjoe@php.net>
Mon, 30 Jan 2017 11:26:02 +0000 (11:26 +0000)
committerJoe Watkins <krakjoe@php.net>
Mon, 30 Jan 2017 11:26:02 +0000 (11:26 +0000)
* pull-request/2348:
  fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)


Trivial merge