From: Mattia Basaglia Date: Wed, 18 Feb 2015 14:48:39 +0000 (+0100) Subject: Merge branch 'master' of ssh://gitlab.com/xonotic/darkplaces into Melanosuchus/preconnect X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=123987113ab1882c71a7a2bf8c610b0498443d45;p=xonotic%2Fdarkplaces.git Merge branch 'master' of ssh://gitlab.com/xonotic/darkplaces into Melanosuchus/preconnect --- 123987113ab1882c71a7a2bf8c610b0498443d45