]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Fri, 27 Feb 2015 15:35:37 +0000 (23:35 +0800)
committerXinchen Hui <laruence@php.net>
Fri, 27 Feb 2015 15:35:37 +0000 (23:35 +0800)
commit794a28832dcfe59fc1ad82a8dda8e3b569ed5637
tree85995b472f0b14d9e7e448a1529e60ace7177453
parent8f5676f73e57345b61447a27bc493b1b8f95ab5b
parent4119879a3905cb1b089f475e8a0471717f7049b3
Merge branch 'PHP-5.6'

Conflicts:
ext/soap/soap.c
ext/soap/soap.c