From: Holger Schemel <info@artsoft.org>
Date: Sat, 30 Aug 2014 08:32:16 +0000 (+0200)
Subject: Merge branch 'master' into releases
X-Git-Tag: 1.2.0
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=refs%2Ftags%2F1.2.0;hp=d4c11da68a7271553ca5591adfae54fd3b45011f;p=rocksndiamonds.git

Merge branch 'master' into releases
---