From: Holger Schemel <info@artsoft.org>
Date: Sat, 30 Aug 2014 08:57:13 +0000 (+0200)
Subject: Merge branch 'master' into releases
X-Git-Tag: 3.2.6.0
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=refs%2Ftags%2F3.2.6.0;hp=111f9432256ce35b49f4729fd94ee19e2a9b9110;p=rocksndiamonds.git

Merge branch 'master' into releases
---