Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 19:32:21 +0000 (21:32 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 19:32:21 +0000 (21:32 +0200)
1  2 
all

diff --cc all
Simple merge