From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 29 Aug 2013 06:32:21 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.4RC1~4^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=632f733ce4d31f7a46e1d70b9454dcb12a98b089;p=php

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).
---

632f733ce4d31f7a46e1d70b9454dcb12a98b089