]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorFerenc Kovacs <tyra3l@gmail.com>
Thu, 15 Sep 2016 09:37:30 +0000 (11:37 +0200)
committerFerenc Kovacs <tyra3l@gmail.com>
Thu, 15 Sep 2016 09:37:30 +0000 (11:37 +0200)

Trivial merge