From: Michael Wallner Date: Fri, 11 Jul 2014 13:08:56 +0000 (+0200) Subject: Merge branch 'R_2_0' X-Git-Tag: RELEASE_2_1_0_RC1~18 X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=548c3c9b17f38514d29d1b93f945d68d18bff22d;hp=b462e5cd5463c8c28e7d130178c0535e07127b5c Merge branch 'R_2_0' ---