diff options
| author | Johannes Schlüter <johannes@php.net> | 2012-06-27 11:46:57 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2012-06-27 11:46:57 +0200 |
| commit | 9a86784859067eaca44cad7f8b4aea00e3ffe6b2 (patch) | |
| tree | c35c7037e9d6cd245f544b06f6c6636ec72b9f33 /ext/json | |
| parent | 7a0f4cfddef2761b5893ececc4682e0cbd90facc (diff) | |
| parent | bc0972e78daec4d7b7adccb7116f8ded2ca5044d (diff) | |
| download | php-git-9a86784859067eaca44cad7f8b4aea00e3ffe6b2.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix memleak in CLI
Conflicts:
sapi/cli/php_cli.c
Diffstat (limited to 'ext/json')
0 files changed, 0 insertions, 0 deletions