From: terencehill <piuntn@gmail.com>
Date: Tue, 18 Oct 2016 17:52:27 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/ons_camera
X-Git-Tag: xonotic-v0.8.2~487^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dfd83905b964f87db1a9b206767a5b207991038a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/ons_camera
---

dfd83905b964f87db1a9b206767a5b207991038a