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

Merge branch 'master' into releases
---

4f6fe351c7b605d97c1ba8f482fb72e467dc19cb