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