From: Holger Schemel <info@artsoft.org>
Date: Sat, 30 Aug 2014 08:38:06 +0000 (+0200)
Subject: Merge branch 'master' into releases
X-Git-Tag: 2.1.1^0
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=61b7a6573a37f9df0710579ad11cc9474aa6f0fc;hp=1e4d3fd0343fa76d5d1e2803b33bb6faa97403d4

Merge branch 'master' into releases
---