From: Holger Schemel <info@artsoft.org>
Date: Sat, 30 Aug 2014 08:59:22 +0000 (+0200)
Subject: Merge branch 'master' into releases
X-Git-Tag: 3.3.0.1
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=d89d2f9380bf343199553a6de58a4c9f7caf5d40;hp=13ef501ab83974ff03258647540ebecad96e45ef;p=rocksndiamonds.git

Merge branch 'master' into releases
---