From: Holger Schemel <info@artsoft.org>
Date: Sat, 30 Aug 2014 09:00:08 +0000 (+0200)
Subject: Merge branch 'master' into releases
X-Git-Tag: 3.3.1.2
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=6453e7a08f5033c516e47bd47be84f6af67d3c45;hp=07e47c9cc4c619ab000b1dd8d8b318eaf5bae3b3;p=rocksndiamonds.git

Merge branch 'master' into releases
---