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

Trivial merge