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

Merge branch 'master' into releases
---

0bb8665ef2b5ff5430dd6808b0be7761912ce4e2