From: unknown <jm@.(none)>
Date: Wed, 10 Nov 2010 00:04:44 +0000 (+0100)
Subject: Merge remote branch 'origin/divVerent/crylink-joinspeed' into tzork/balance-tzork
X-Git-Tag: xonotic-v0.1.0preview~153^2~2^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d4a496548f33a19bae54c700639079dcf453dde1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/divVerent/crylink-joinspeed' into tzork/balance-tzork
---

d4a496548f33a19bae54c700639079dcf453dde1