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

Merge branch 'master' into releases
---

b6764658a537d18821afe606350e26d95b6daff6