diff options
author | Keyur Govande <keyur@php.net> | 2014-07-30 02:41:01 +0000 |
---|---|---|
committer | Keyur Govande <keyur@php.net> | 2014-07-30 02:41:01 +0000 |
commit | f0278589e1583855e04ee04bfe30ccef3e9ccda2 (patch) | |
tree | 6a56befed506337fb48724127922a808f4fb7b59 /ext/reflection/php_reflection.c | |
parent | a7dad26c4bf80b65c1abd51e1695b3895add27f5 (diff) | |
parent | ab4c4c3970f3c9d03a4f65a923fb31618d08a2c8 (diff) | |
download | php-git-f0278589e1583855e04ee04bfe30ccef3e9ccda2.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Undo inadvertent commit of php_version
Corrected patch for bug #60616
Diffstat (limited to 'ext/reflection/php_reflection.c')
0 files changed, 0 insertions, 0 deletions