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