diff options
author | Dmitry Stogov <dmitry@zend.com> | 2015-04-14 17:18:55 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2015-04-14 17:18:55 +0300 |
commit | 65baab7741c3deb4b9b6e1a5a7972c3318f9ea34 (patch) | |
tree | 6933fb286d7134fe12f6b5e446077923effaf745 /ext/reflection/php_reflection.c | |
parent | b7d8edca1f9e2fed2132041a84f6dd893c9c6c16 (diff) | |
parent | e8fb5201ba204cc59104db49f45737385abe139e (diff) | |
download | php-git-65baab7741c3deb4b9b6e1a5a7972c3318f9ea34.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
Bug #63336 is not a bug
fix test
Conflicts:
Zend/tests/bug63336.phpt
Diffstat (limited to 'ext/reflection/php_reflection.c')
0 files changed, 0 insertions, 0 deletions