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
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=0a37fd0ca34e2ff68d0f8caa958a926e947fd6d3;hp=8f33ee4940b9c35bf4627b7ef1126d03748da646;p=rocksndiamonds.git

Merge branch 'master' into releases
---