From: terencehill <piuntn@gmail.com>
Date: Sat, 24 Jan 2015 00:27:31 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/menu_optimizations
X-Git-Tag: xonotic-v0.8.1~138^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=12e23132497ee2f6ebe5d7b77cef7f9cba0bb55c;p=xonotic%2Fxonotic-data.pk3dir.git

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

12e23132497ee2f6ebe5d7b77cef7f9cba0bb55c