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/?a=commitdiff_plain;h=434a5e1a3e70de7ec75278e8cb82eb1c1355eb1e;p=rocksndiamonds.git

Merge branch 'master' into releases
---

fc4457661dae8eae32f70060111e74924e0dbf4d