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

Merge branch 'master' into releases
---