From: Michael Wallner <mike@php.net>
Date: Wed, 9 Jul 2014 13:34:50 +0000 (+0200)
Subject: Merge branch 'R_2_0'
X-Git-Tag: RELEASE_2_1_0_RC1~31
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=5e30ba54d44779779ed6bc4b45ea9ccf005490ce;hp=--cc

Merge branch 'R_2_0'
---

5e30ba54d44779779ed6bc4b45ea9ccf005490ce