]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorFerenc Kovacs <tyra3l@gmail.com>
Fri, 14 Oct 2016 06:08:10 +0000 (08:08 +0200)
committerFerenc Kovacs <tyra3l@gmail.com>
Fri, 14 Oct 2016 06:08:10 +0000 (08:08 +0200)

Trivial merge