Merge remote branch 'refs/remotes/origin/ThePWTULN/campaigntimer'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 07:02:59 +0000 (09:02 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 22 Oct 2010 07:02:59 +0000 (09:02 +0200)
1  2 
qcsrc/server/g_world.qc

Simple merge