From: Holger Schemel <info@artsoft.org>
Date: Sat, 30 Aug 2014 08:57:17 +0000 (+0200)
Subject: Merge branch 'master' into releases
X-Git-Tag: 3.2.6.1
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=87ff861cd43622dd9e6ada0a8e95c9e3b5cefb07;hp=1ceb7ce8723b32b267758bfda3bb7903fff8ea7a;p=rocksndiamonds.git

Merge branch 'master' into releases
---