From: Holger Schemel <info@artsoft.org>
Date: Tue, 1 Mar 2016 23:56:08 +0000 (+0100)
Subject: Merge branch 'master' into global-anims
X-Git-Tag: 4.0.0.0-rc1~62
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=30f5fd7b8f2235820dcbe638a18319d802317530;hp=-c

Merge branch 'master' into global-anims
---

30f5fd7b8f2235820dcbe638a18319d802317530