From: Debugger <pyngot@hotmail.com>
Date: Wed, 4 Sep 2013 23:10:37 +0000 (+0200)
Subject: Merge branch 'master' into debugger/tdm_netscore
X-Git-Tag: xonotic-v0.8.0~347^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f111e54b35268d60a0c32ba8ff85fe63834c6c7c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into debugger/tdm_netscore
---

f111e54b35268d60a0c32ba8ff85fe63834c6c7c