From: Mattia Basaglia <mattia.basaglia@gmail.com>
Date: Mon, 20 Jul 2015 17:32:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin' into Melanosuchus/modernize
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=003a415b7a70f3791d4bcabde45d8de4e25a8aeb;p=xonotic%2Fnetradiant.git

Merge remote-tracking branch 'origin' into Melanosuchus/modernize
---

003a415b7a70f3791d4bcabde45d8de4e25a8aeb