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

Merge branch 'master' into releases
---

21d98987523453cd39ea3de441b0a69546f89dfc