Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 20 Jan 2011 09:53:21 +0000 (10:53 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 20 Jan 2011 09:53:21 +0000 (10:53 +0100)
1  2 
all

diff --cc all
Simple merge