Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Tue, 31 Jan 2012 20:54:43 +0000 (21:54 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 31 Jan 2012 20:54:43 +0000 (21:54 +0100)
1  2 
all

diff --cc all
Simple merge