From: Holger Schemel <info@artsoft.org>
Date: Sat, 30 Aug 2014 08:43:25 +0000 (+0200)
Subject: Merge branch 'master' into releases
X-Git-Tag: 3.0.2
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=refs%2Ftags%2F3.0.2;p=rocksndiamonds.git

Merge branch 'master' into releases
---

f6ffcacabb98192917943ce637b64a9f1e267305