From: Michael Wallner <mike@php.net>
Date: Fri, 11 Jul 2014 12:19:16 +0000 (+0200)
Subject: Merge branch 'R_2_0'
X-Git-Tag: RELEASE_2_1_0_RC1~21
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=aac4d7b0a183faeeaeb770c0052af68c46d49f18;hp=-c

Merge branch 'R_2_0'
---

aac4d7b0a183faeeaeb770c0052af68c46d49f18