From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 25 Dec 2012 06:33:01 +0000 (+0400)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8c719c0687aea8c13241abb5a52eefbac1a3a95;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Traits refactoring
---

b8c719c0687aea8c13241abb5a52eefbac1a3a95