diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-03-19 15:00:24 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-03-19 15:00:24 +0400 |
| commit | 74e11fb14c983302c84ee88fee40248b6f9b0f9a (patch) | |
| tree | 9e350aa56daf80bfb3f00c1db685b7c9d8af5320 /main/php_ini.c | |
| parent | ef8c8eaa9583130029facf2817d2c5c4b01f1c41 (diff) | |
| parent | 84630a1109084507bc0c78301db831328229f1cb (diff) | |
| download | php-git-74e11fb14c983302c84ee88fee40248b6f9b0f9a.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #62343 (Show class_alias In get_declared_classes())
Conflicts:
NEWS
Diffstat (limited to 'main/php_ini.c')
0 files changed, 0 insertions, 0 deletions