From: Holger Schemel Date: Sat, 30 Aug 2014 08:53:10 +0000 (+0200) Subject: Merge branch 'master' into releases X-Git-Tag: 3.2.2^0 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=b6764658a537d18821afe606350e26d95b6daff6;p=rocksndiamonds.git Merge branch 'master' into releases --- b6764658a537d18821afe606350e26d95b6daff6