]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorJulien Pauli <jpauli@php.net>
Fri, 12 Dec 2014 15:14:24 +0000 (16:14 +0100)
committerJulien Pauli <jpauli@php.net>
Fri, 12 Dec 2014 15:14:24 +0000 (16:14 +0100)
commitebe755f14942b63125f6f0ab3054e9d086d28382
tree2ee489527e42cc6b783d896f7c668a05d2d0d675
parent2e735660d2f46da7b4918a4c9ff92d707e00c264
parent4cda98264ec4ab80e9ca54c10cf2f332d6e09290
Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated NEWS
  Updated NEWS
  Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)

Conflicts:
Zend/zend_compile.c
Zend/zend_inheritance.c