Merge branch 'R_2_0'
authorMichael Wallner <mike@php.net>
Fri, 4 Apr 2014 12:14:24 +0000 (14:14 +0200)
committerMichael Wallner <mike@php.net>
Fri, 4 Apr 2014 12:14:24 +0000 (14:14 +0200)
commit1ebe4d9f8e3e0d301809b9279ba428ba829b7f17
tree10a48bfbea0fbad5b44fd68d0b97851f73e87838
parent61279745dda8d178a049a71d9f8b8fce0f245ab3
parent928a3fab9eecefea066e0c231a3b82dcdce260c9
Merge branch 'R_2_0'

Conflicts:
php_http.h