From: Holger Schemel <info@artsoft.org>
Date: Sat, 30 Aug 2014 08:36:20 +0000 (+0200)
Subject: Merge branch 'master' into releases
X-Git-Tag: 2.0.1
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=6a46b5ed85c1d2768aab68ea4d0849a4ee4b8cb8;p=rocksndiamonds.git

Merge branch 'master' into releases
---

bcb174b5375ad10e279b20204c913c873fc2c65d