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