From: Holger Schemel <info@artsoft.org>
Date: Sat, 30 Aug 2014 08:44:02 +0000 (+0200)
Subject: Merge branch 'master' into releases
X-Git-Tag: 3.0.5^0
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=f4afcfc617fe36ce18d3509ef20d90b0db271bea;hp=-c;p=rocksndiamonds.git

Merge branch 'master' into releases
---

f4afcfc617fe36ce18d3509ef20d90b0db271bea