]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorFerenc Kovacs <tyra3l@gmail.com>
Thu, 18 Aug 2016 11:03:14 +0000 (13:03 +0200)
committerFerenc Kovacs <tyra3l@gmail.com>
Thu, 18 Aug 2016 11:03:14 +0000 (13:03 +0200)

Trivial merge