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

diff --cc all
Simple merge