From: Mattia Basaglia <mattia.basaglia@gmail.com>
Date: Sat, 28 Feb 2015 22:18:27 +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=875f8d43d749b50d2bf5ebe21e8d6a791a00acb3;p=xonotic%2Fdarkplaces.git

Merge branch 'master' of ssh://gitlab.com/xonotic/darkplaces into Melanosuchus/preconnect
---

875f8d43d749b50d2bf5ebe21e8d6a791a00acb3