From: terencehill <piuntn@gmail.com>
Date: Tue, 13 Oct 2015 22:41:50 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/tooltips_cleanup
X-Git-Tag: xonotic-v0.8.2~1824^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F230%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

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

c51698509e174e343dff48128a1dcfff1527c535