diff options
| author | Anatol Belski <ab@php.net> | 2013-05-25 00:02:09 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-05-25 00:02:09 +0200 |
| commit | fbdce3b6f6d4267f497289f65ecee462bd25cfda (patch) | |
| tree | c6ca63815fd082f8b01ebee680ceaef92c43e6aa /sapi/cli/php_cli_server.h | |
| parent | af13dded5c7f7e5d7ab19a9fee53fd57c905a25a (diff) | |
| parent | 2d386db8787024513c0654179a99270e13d0c127 (diff) | |
| download | php-git-fbdce3b6f6d4267f497289f65ecee462bd25cfda.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #64916 finfo testcase contains copyrighted music.
Diffstat (limited to 'sapi/cli/php_cli_server.h')
0 files changed, 0 insertions, 0 deletions