Merge branch 'R_2_0'
authorMichael Wallner <mike@php.net>
Fri, 4 Apr 2014 12:05:55 +0000 (14:05 +0200)
committerMichael Wallner <mike@php.net>
Fri, 4 Apr 2014 12:05:55 +0000 (14:05 +0200)
commita92f3562e87cae473417b4a2c82001ed2a93951d
tree52ede268cc2b4bdbd8b3c9f54186555a41e22e5c
parentbc03617327a193d5222ad045e096bc2b8abb6f97
parent597e4578306389fdd5894705a7aabcb36d71c42d
Merge branch 'R_2_0'

Conflicts:
php_http.h