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

Merge branch 'master' into releases
---