From: Michael Wallner Date: Thu, 6 Nov 2014 15:23:38 +0000 (+0100) Subject: Merge branch 'R_2_1' X-Git-Tag: RELEASE_2_2_0_RC1~9^2~2 X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=4745cd2cc0c3bd610fd2fc1ef120f37ab4111d5b;hp=-c Merge branch 'R_2_1' --- 4745cd2cc0c3bd610fd2fc1ef120f37ab4111d5b