]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Thu, 13 Oct 2016 11:09:29 +0000 (13:09 +0200)
committerAnatol Belski <ab@php.net>
Thu, 13 Oct 2016 11:09:29 +0000 (13:09 +0200)
* PHP-7.1:
  fix gettimeofday proto availability


Trivial merge