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