diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-05-26 18:05:59 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-05-26 18:06:15 -0700 |
| commit | 076c25bfec126a431de574e4bad8df053ba50374 (patch) | |
| tree | b4881e01f394c4c9f5cb6735479799921c4dd11a /sapi/phpdbg/phpdbg.h | |
| parent | 5ce11c2698ac944cb1e78ce50c2e7bfe3719303f (diff) | |
| parent | d184f07b3ccc30113ae11dd68f987f6cefe36d79 (diff) | |
| download | php-git-076c25bfec126a431de574e4bad8df053ba50374.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
backport this piece from 5.6, related to the #66307 fix
Fixed bug #66307 Fileinfo crashes with powerpoint files
Diffstat (limited to 'sapi/phpdbg/phpdbg.h')
0 files changed, 0 insertions, 0 deletions