Merge remote branch 'origin/fruitiex/mirceakitsune_mapcoordinator'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:42:29 +0000 (21:42 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:42:29 +0000 (21:42 +0100)
1  2 
xonotic-credits.txt

Simple merge