From: terencehill <piuntn@gmail.com>
Date: Fri, 3 Jul 2015 13:49:33 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/accelerometer_fix
X-Git-Tag: xonotic-v0.8.1~52^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0ae1f40f1237c4888d08cc716287a277f4472d9f;p=xonotic%2Fxonotic-data.pk3dir.git

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

0ae1f40f1237c4888d08cc716287a277f4472d9f