]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorFerenc Kovacs <tyra3l@gmail.com>
Fri, 6 Jan 2017 00:50:08 +0000 (01:50 +0100)
committerFerenc Kovacs <tyra3l@gmail.com>
Fri, 6 Jan 2017 00:50:08 +0000 (01:50 +0100)

Trivial merge