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