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

Merge branch 'master' into releases
---

c95428b8dc9d94d39c70acf804826150598a8bdf