From: Michael Wallner Date: Tue, 5 Aug 2014 16:46:17 +0000 (+0200) Subject: Merge branch 'DEV_2' into HEAD X-Git-Tag: RELEASE_2_1_0_RC3~10^2 X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=47be714b40e14b6b5cdc2f35a7994efd13c2076e Merge branch 'DEV_2' into HEAD --- 47be714b40e14b6b5cdc2f35a7994efd13c2076e