]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorFerenc Kovacs <tyra3l@gmail.com>
Tue, 2 Jan 2018 23:33:20 +0000 (00:33 +0100)
committerFerenc Kovacs <tyra3l@gmail.com>
Tue, 2 Jan 2018 23:33:20 +0000 (00:33 +0100)

Trivial merge