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

Merge branch 'master' into releases
---

1ae6433828b1881d7810082472c72dfb3372a061