]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 427de31 d77eb41)
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Mon, 18 Feb 2013 12:36:25 +0000 (16:36 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 18 Feb 2013 12:36:25 +0000 (16:36 +0400)
* PHP-5.5:
  Fixed bug #64070 (Inheritance with Traits failed with error)


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.