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

Merge branch 'master' into releases
---

8cbfc8a88d2eeb5400bad0ff556af7486532188f