From: Jay Dolan Date: Tue, 8 Dec 2015 14:00:57 +0000 (-0500) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Tag: xonotic-v0.8.2~19^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b76bdbdcb68e84944acdb5ea7e5402e337c0f848;p=xonotic%2Fnetradiant.git Merge remote-tracking branch 'upstream/master' --- b76bdbdcb68e84944acdb5ea7e5402e337c0f848