From: Holger Schemel <info@artsoft.org>
Date: Sat, 30 Aug 2014 08:56:16 +0000 (+0200)
Subject: Merge branch 'master' into releases
X-Git-Tag: 3.2.4
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=e08bf878bb9e5590632666a94f9e0ff39b04b100;hp=28514fc1f1f57cd280c32fba47eed6893caa3641;p=rocksndiamonds.git

Merge branch 'master' into releases
---