Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <rpolzer@nb-04.(none)>
Mon, 29 Mar 2010 06:41:31 +0000 (08:41 +0200)
committerRudolf Polzer <rpolzer@nb-04.(none)>
Mon, 29 Mar 2010 06:41:31 +0000 (08:41 +0200)
1  2 
all

diff --cc all
Simple merge