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

Merge branch 'master' into releases
---

ac4f3272beb264e6642bc84c44f3dc08e22680f2