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