From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 29 Aug 2013 06:31:50 +0000 (+0400)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-5.6.0alpha1~232
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ff7dd05bf7fc9ac19821c59aaa09f0f826538a3;p=php

Merge branch 'master' of git.php.net:php-src

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

6ff7dd05bf7fc9ac19821c59aaa09f0f826538a3