diff options
author | Dmitry Stogov <dmitry@zend.com> | 2012-12-25 10:33:01 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2012-12-25 10:33:01 +0400 |
commit | b8c719c0687aea8c13241abb5a52eefbac1a3a95 (patch) | |
tree | b95014d80b50b345f6161bca5c5f784a66cc2677 /ext/mysql/php_mysql.c | |
parent | be7b0bc3ec02e4f223920ee6397f9c4993eb7df5 (diff) | |
parent | 3f8c729e693c432b438cd33679182260d8732e30 (diff) | |
download | php-git-b8c719c0687aea8c13241abb5a52eefbac1a3a95.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Traits refactoring
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions