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)
Conflicts:
php_http.h


Trivial merge