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

Merge branch 'master' into releases
---

cc5a0e1eae262a928c1a0f451c6ce401f52d8828