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

Merge branch 'master' into releases
---

2622581d611b8b727b1f7c4cffd3d72bcd9065bf