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

Merge branch 'master' into releases
---

24fbe612bfb4e4a49c79f7cbade55c3c258441d8