From: terencehill <piuntn@gmail.com>
Date: Thu, 24 Dec 2015 00:46:46 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/menu_optimization
X-Git-Tag: xonotic-v0.8.2~1286^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7f5ad47610dc8b5580cc96ae961a57cca96e6975;p=xonotic%2Fxonotic-data.pk3dir.git

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

7f5ad47610dc8b5580cc96ae961a57cca96e6975