diff options
| author | Anatol Belski <ab@php.net> | 2014-04-17 11:05:21 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-17 11:05:21 +0200 |
| commit | dc407c24026aae1d006c649f366dc32dac95e207 (patch) | |
| tree | 81ea92d78464a56d7cd47732aa552ca46217dcfa /sapi/phpdbg/phpdbg_print.c | |
| parent | ba0383024137c0d3c102ee9fb4eb19d0f9d04578 (diff) | |
| parent | 5328d4289946e260232f3195ba2e0f0eb173d5ef (diff) | |
| download | php-git-dc407c24026aae1d006c649f366dc32dac95e207.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #67072 Echoing unserialized "SplFileObject" crash
Conflicts:
ext/standard/var_unserializer.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_print.c')
0 files changed, 0 insertions, 0 deletions