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

Merge branch 'master' into releases
---

fc4457661dae8eae32f70060111e74924e0dbf4d