From: Rudolf Polzer <divverent@gmail.com>
Date: Sun, 11 Jan 2015 16:09:16 +0000 (+0000)
Subject: Merge branch 'terencehill/keybinds.txt.it_update' into 'master'
X-Git-Tag: xonotic-v0.8.0~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c8148c32509bf9acc7106b9565cbc6627f726ce7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/keybinds.txt.it_update' into 'master'

Terencehill/keybinds.txt.it update

keybinds.txt.it update

See merge request !71
---

c8148c32509bf9acc7106b9565cbc6627f726ce7