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