diff options
| author | Julien Pauli <jpauli@php.net> | 2015-07-29 10:04:08 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-07-29 10:04:08 +0200 |
| commit | 66edc158755a8e960499913f16f6455797bb5803 (patch) | |
| tree | 3e85723322d7d0b3b021f87e6856f6dfb07368cf /ext/soap/php_http.c | |
| parent | ce5c4500cd942ab85efa1e916ef00de860be9e6e (diff) | |
| parent | 8f1baa6e1ceffb54529402e210e6397466e1049a (diff) | |
| download | php-git-66edc158755a8e960499913f16f6455797bb5803.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Adjust Git-Rules
5.4.44 next
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'ext/soap/php_http.c')
0 files changed, 0 insertions, 0 deletions