From: Michael Wallner <mike@php.net>
Date: Thu, 24 Apr 2014 09:06:19 +0000 (+0200)
Subject: Merge branch 'R_2_0'
X-Git-Tag: RELEASE_2_1_0_RC1~37
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=7da592d8df565f11e666faa0ab41090f826156c3

Merge branch 'R_2_0'
---

7da592d8df565f11e666faa0ab41090f826156c3