From: Mattia Basaglia <mattia.basaglia@gmail.com>
Date: Wed, 4 Mar 2015 17:57:48 +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=refs%2Fheads%2FMelanosuchus%2Fpreconnect;p=xonotic%2Fdarkplaces.git

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

6d1417ff95fbdf022b84fa78f11a3db01f6131f3