From: Mattia Basaglia <mattia.basaglia@gmail.com>
Date: Mon, 2 Mar 2015 20:43:19 +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=a44e85c2adf1cfead15035e5199310b34e6bdc78;p=xonotic%2Fdarkplaces.git

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

a44e85c2adf1cfead15035e5199310b34e6bdc78