]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Tue, 2 Aug 2016 09:08:21 +0000 (11:08 +0200)
committerAnatol Belski <ab@php.net>
Tue, 2 Aug 2016 09:08:21 +0000 (11:08 +0200)
* PHP-7.0:
  fix php_version.h


Trivial merge