]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: abf5ed4 a8cc0b0)
Merge branch 'PHP-5.4'
authorDmitry Stogov <dmitry@zend.com>
Wed, 21 Mar 2012 12:49:49 +0000 (16:49 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 21 Mar 2012 12:49:49 +0000 (16:49 +0400)
* PHP-5.4:
  Fixed bug #49853 (Soap Client stream context header option ignored)

Conflicts:
NEWS


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.