From: Michael Wallner Date: Wed, 15 Jun 2016 14:11:52 +0000 (+0200) Subject: Merge branch 'v2.6.x' X-Git-Tag: RELEASE_3_1_0_BETA1~7 X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=28d7c572181c8c3c335edd3df539f75c3bbde0fd Merge branch 'v2.6.x' --- 28d7c572181c8c3c335edd3df539f75c3bbde0fd