From: Michael Wallner Date: Thu, 25 Sep 2014 13:35:31 +0000 (+0200) Subject: Merge branch 'R_2_1' X-Git-Tag: RELEASE_2_2_0_RC1~9^2~27 X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=e7d985254d2b3e64d665f118a4086680bcfe248e Merge branch 'R_2_1' --- e7d985254d2b3e64d665f118a4086680bcfe248e