From: Holger Schemel Date: Sat, 30 Aug 2014 09:00:08 +0000 (+0200) Subject: Merge branch 'master' into releases X-Git-Tag: 3.3.1.2^0 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=refs%2Fheads%2Freleases;p=rocksndiamonds.git Merge branch 'master' into releases --- bace01c8d5b4baee8776394de380867856d7d61c