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

Merge branch 'master' into releases
---