From: Holger Schemel Date: Sat, 30 Aug 2014 08:49:18 +0000 (+0200) Subject: Merge branch 'master' into releases X-Git-Tag: 3.1.1^0 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=d0fdd22ffb70dbd65efbabc6c509fb6ef75558c4;p=rocksndiamonds.git Merge branch 'master' into releases --- d0fdd22ffb70dbd65efbabc6c509fb6ef75558c4