Merge remote branch 'origin/fruitiex/glowplant'
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 16:29:50 +0000 (18:29 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 16:29:50 +0000 (18:29 +0200)
commit31860279d0c912ff5c238ae008cc4eebd96456b2
tree0df36bce8c2fcc710535df973190c8a4858b3dfe
parent2d3aa4d3152918aced33cc09462a1e0b42341cbb
parent0e12e823def3594e791e596feac1e4a5863b421b
Merge remote branch 'origin/fruitiex/glowplant'