From: Michael Wallner <mike@php.net>
Date: Thu, 17 Apr 2014 10:25:57 +0000 (+0200)
Subject: Merge branch 'R_2_0'
X-Git-Tag: RELEASE_2_1_0_RC1~39
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=af622b3219e8037dce34a4e24719cc6408ecad00;hp=af622b3219e8037dce34a4e24719cc6408ecad00;p=m6w6%2Fext-http

Merge branch 'R_2_0'
---