]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorPierrick Charron <pierrick@webstart.fr>
Sat, 23 Apr 2016 22:38:51 +0000 (18:38 -0400)
committerPierrick Charron <pierrick@webstart.fr>
Sat, 23 Apr 2016 22:38:51 +0000 (18:38 -0400)

Trivial merge