Merge remote-tracking branch 'origin/master' into divVerent/cortez-map-fixes
authorRudolf Polzer <divverent@xonotic.org>
Sat, 9 Jul 2011 16:24:43 +0000 (18:24 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 9 Jul 2011 16:24:43 +0000 (18:24 +0200)
commitbdbf23bc1bc1245e61ae56c2eba30f59368a5679
treed0605c36d7f16efa2d224eb58a2d08e9c717c1b2
parent89ef2eb82b92d42d17f5e6d93b9236de1ce3e50d
parent877b8212505540880ce7204e1a369f35be028bab
Merge remote-tracking branch 'origin/master' into divVerent/cortez-map-fixes