Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 16:16:57 +0000 (17:16 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 16:16:57 +0000 (17:16 +0100)
commit5da4b1144b28443b45ac68a73d77be8345046795
treee0d8fb99d448cf0badef15deedefb072f0f5e98f
parent5d595aa72acdb0da6ec5c7d6b1ef1a13af06d844
parente2c342030c7919f2d5f434592bf7e0ef6e436139
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic