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