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

Trivial merge