From: Michael Wallner Date: Wed, 14 Sep 2016 09:39:47 +0000 (+0200) Subject: Merge branch 'v2.6.x' X-Git-Tag: RELEASE_3_1_0_RC1~26 X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=d5c7f974d81c724c6fad8b54f1c37ce0795119de Merge branch 'v2.6.x' --- d5c7f974d81c724c6fad8b54f1c37ce0795119de