]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorStanislav Malyshev <stas@php.net>
Wed, 27 Apr 2016 06:04:40 +0000 (23:04 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 27 Apr 2016 06:04:40 +0000 (23:04 -0700)
* PHP-7.0:
  fix build


Trivial merge