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

Merge branch 'master' into releases
---

d5abc7280c24ee485393cf1c0a2f3637c20f3408