From: Holger Schemel <info@artsoft.org>
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;hp=9618cdb31ec89b5f68f79a0d6011cd0c6c580a85;p=rocksndiamonds.git

Merge branch 'master' into releases
---