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

Merge branch 'master' into releases
---

bfcccf30d39e98f488fa1c0bac7551a0e54ee170