diff options
author | Dmitry Stogov <dmitry@zend.com> | 2013-08-29 11:19:02 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2013-08-29 11:19:02 +0400 |
commit | 0f3977bc0fd31ee188ee50f44b130420812b93a9 (patch) | |
tree | f8529a9a9001e6fccdc221994399a27d880d7ef3 /sapi/cli/php_cli_server.c | |
parent | 94816ed9bfe16bd1507a1abc708793e41c06ad79 (diff) | |
parent | dfc6feb6e84f27094e6a2e3947caa094f7c35d26 (diff) | |
download | php-git-0f3977bc0fd31ee188ee50f44b130420812b93a9.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Conflicts:
NEWS
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions