diff options
| author | Anatol Belski <ab@php.net> | 2014-04-24 19:33:54 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-24 19:33:54 +0200 |
| commit | 74ce9da5dcaa31a50bb2395df6200b191fdc0e41 (patch) | |
| tree | 905740bfe1a58512d91410c7a506cce16def0606 /main/php_variables.c | |
| parent | cd2641973cbd665301739593a291a1fa78a05578 (diff) | |
| parent | 03fa5501a84af2bda7d81c732d46d2a68ee0e855 (diff) | |
| download | php-git-74ce9da5dcaa31a50bb2395df6200b191fdc0e41.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66307 Fileinfo crashes with powerpoint files
Conflicts:
ext/fileinfo/libmagic/readcdf.c
Diffstat (limited to 'main/php_variables.c')
0 files changed, 0 insertions, 0 deletions