From: Holger Schemel 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/?a=commitdiff_plain;h=61b7a6573a37f9df0710579ad11cc9474aa6f0fc;p=rocksndiamonds.git Merge branch 'master' into releases --- 61b7a6573a37f9df0710579ad11cc9474aa6f0fc