]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorAnatol Belski <ab@php.net>
Thu, 5 Jan 2017 00:52:37 +0000 (01:52 +0100)
committerAnatol Belski <ab@php.net>
Thu, 5 Jan 2017 00:52:37 +0000 (01:52 +0100)
* PHP-7.0:
  quick fix for the base branch version parsing, not perfect still


Trivial merge