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

Merge branch 'master' into releases
---

4b0e4c62074b641ea80d628a9a0d00df15f1d6bc