]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorFerenc Kovacs <tyra3l@gmail.com>
Wed, 9 Nov 2016 01:18:18 +0000 (02:18 +0100)
committerFerenc Kovacs <tyra3l@gmail.com>
Wed, 9 Nov 2016 01:18:18 +0000 (02:18 +0100)

Trivial merge