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

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

f60c05d53612aba786e7f24fc7a8920cd1b7495c