Merge remote-tracking branch 'origin/master' into divVerent/force_colors_teamplay
authorRudolf Polzer <divverent@xonotic.org>
Wed, 25 Jul 2012 07:51:04 +0000 (09:51 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 25 Jul 2012 07:51:04 +0000 (09:51 +0200)
commitc2a166015e593d43dae14c6e4f37e0e7d71dd5fc
tree2994dac234b5a4416f844a5e84d25eeff4863450
parent770fcdb94523646b4869e658ecd3750aa9c693b7
parente07aef75650ef86c5b68ded7d37586b1d39d9282
Merge remote-tracking branch 'origin/master' into divVerent/force_colors_teamplay