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

Merge branch 'master' into releases
---