]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 91538e4 42437dd)
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Mon, 18 Feb 2013 12:20:49 +0000 (16:20 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 18 Feb 2013 12:20:49 +0000 (16:20 +0400)
commitd77eb411ea5d80379ee92a908f543b91fa293383
tree8061e5b3e21fcf046ceaeb036c935429db47f349tree | snapshot
parent91538e4e13908a8cfcb25c5286e4222ef4077a7ecommit | diff
parent42437dd870de28eee6c9127f4c7e7c78ba8e0152commit | diff
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64070 (Inheritance with Traits failed with error)

Conflicts:
NEWS
Zend/zend_compile.c
Zend/zend_compile.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.