]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Thu, 29 Aug 2013 06:32:21 +0000 (10:32 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 29 Aug 2013 06:32:21 +0000 (10:32 +0400)
commit632f733ce4d31f7a46e1d70b9454dcb12a98b089
tree1646d20cdc83482f214aacdd49e8446163196838
parent790db9ff9b95d9dfaf6720593517dc0368f1fe7f
parente356d790cccc309acf870dc22be7d00edaed8261
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Avoid compiler warning
  Fix bug #65579 (Using traits with get_class_methods causes segfault).