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

Merge branch 'master' into releases
---

dbb6dd2fa61e2999cec9c129ba546a28db7ff602