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^0
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=372782865e5e5791701d0f2bdfaa454cf45a59c3;hp=-c;p=rocksndiamonds.git

Merge branch 'master' into releases
---

372782865e5e5791701d0f2bdfaa454cf45a59c3