diff options
author | David Soria Parra <dsp@php.net> | 2012-03-24 14:38:03 +0100 |
---|---|---|
committer | David Soria Parra <dsp@php.net> | 2012-03-24 14:38:03 +0100 |
commit | cb54532b7f63fb9f223e3b39116db86191d6bafe (patch) | |
tree | 7cda38b140075f5f225cdfbed2acd651fa477750 /ext/soap/php_http.c | |
parent | 9c99a89e8e2f740b96e3f8b423c0ce6702cc3be6 (diff) | |
parent | 521ebec3e9bcd4fa75772d2bfa57a733dfe1d5fa (diff) | |
download | php-git-cb54532b7f63fb9f223e3b39116db86191d6bafe.tar.gz |
Merge commit '521ebec3e9bcd4fa75772d2bfa57a733dfe1d5fa' into PHP-5.3
This merge combines a accidentaly separated head, leading to two duplicated
commits in history (again).
* commit '521ebec3e9bcd4fa75772d2bfa57a733dfe1d5fa':
Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
Diffstat (limited to 'ext/soap/php_http.c')
0 files changed, 0 insertions, 0 deletions