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^0
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=bcb174b5375ad10e279b20204c913c873fc2c65d;p=rocksndiamonds.git

Merge branch 'master' into releases
---

bcb174b5375ad10e279b20204c913c873fc2c65d