From: Michael Wallner <mike@php.net>
Date: Tue, 5 Aug 2014 16:47:19 +0000 (+0200)
Subject: Merge branch 'merge-DEV_2'
X-Git-Tag: RELEASE_2_1_0_RC3~10
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=eaa046dc3e6496e523a17c3b786ef27067b9795c;hp=-c

Merge branch 'merge-DEV_2'
---

eaa046dc3e6496e523a17c3b786ef27067b9795c