From: Michael Wallner Date: Mon, 22 Aug 2016 11:38:39 +0000 (+0200) Subject: Merge branch 'v2.6.x' X-Git-Tag: RELEASE_3_1_0_BETA1~1 X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=c55db20a130d729ca8747346c5e5ab9fb52fd89d;hp=c55db20a130d729ca8747346c5e5ab9fb52fd89d Merge branch 'v2.6.x' ---