Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Mon, 26 Apr 2010 12:11:23 +0000 (14:11 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 26 Apr 2010 12:11:23 +0000 (14:11 +0200)
1  2 
all

diff --cc all
Simple merge