From: Mattia Basaglia <mattia.basaglia@gmail.com>
Date: Sat, 31 Jan 2015 21:44:50 +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=cc9aecda08c0efed08aa9eee011c79c3bca883e9;p=xonotic%2Fdarkplaces.git

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

cc9aecda08c0efed08aa9eee011c79c3bca883e9