From: terencehill <piuntn@gmail.com>
Date: Wed, 9 Nov 2011 23:35:06 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/cursormode
X-Git-Tag: xonotic-v0.7.0~196^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fbec40012e84855d10d0f99f2ead025aca3153c6;p=xonotic%2Fxonotic-data.pk3dir.git

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

fbec40012e84855d10d0f99f2ead025aca3153c6