Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divVerent@alientrap.org>
Fri, 20 Aug 2010 12:23:07 +0000 (14:23 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Fri, 20 Aug 2010 12:23:07 +0000 (14:23 +0200)
1  2 
all

diff --cc all
Simple merge