From: Michael Wallner Date: Thu, 10 Jul 2014 12:30:16 +0000 (+0200) Subject: Merge branch 'R_2_0' X-Git-Tag: RELEASE_2_1_0_RC1~24 X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=378ac49eac85b36e9db715523bd514de9730d3e4 Merge branch 'R_2_0' --- 378ac49eac85b36e9db715523bd514de9730d3e4