Merge remote branch 'origin/fruitiex/campaign'
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 7 Dec 2010 10:08:31 +0000 (11:08 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 7 Dec 2010 10:08:31 +0000 (11:08 +0100)
1  2 
qcsrc/server/teamplay.qc

Simple merge