From: Mario <mario@smbclan.net>
Date: Fri, 17 Jun 2016 13:02:09 +0000 (+1000)
Subject: Merge branch 'div0-stable' into Mario/noclip_prediction_fix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F33%2Fhead;p=xonotic%2Fdarkplaces.git

Merge branch 'div0-stable' into Mario/noclip_prediction_fix
---

51f2e8f06c1bbcfabc3f3800269c51c580819945