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