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

Trivial merge