Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 7 Oct 2010 12:17:54 +0000 (14:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 7 Oct 2010 12:17:54 +0000 (14:17 +0200)
1  2 
all

diff --cc all
Simple merge