]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6864d9 0ea0093)
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Thu, 29 Aug 2013 06:31:50 +0000 (10:31 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 29 Aug 2013 06:31:50 +0000 (10:31 +0400)
* 'master' of git.php.net:php-src:
  Avoid compiler warning
  Fix bug #65579 (Using traits with get_class_methods causes segfault).


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