From: Michael Wallner Date: Thu, 6 Nov 2014 17:48:27 +0000 (+0100) Subject: Merge branch 'R_2_1' X-Git-Tag: RELEASE_2_2_0_RC1~9^2~1 X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=caddd8ffdc0b23544671c64df711c04d3da1b4b4 Merge branch 'R_2_1' --- caddd8ffdc0b23544671c64df711c04d3da1b4b4