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

Merge branch 'master' into releases
---

fc5c46ee4587fb1bbc60a1b6bfc0221d83be3d81