Merge remote branch 'origin/morphed/teleporter'
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 19 Jul 2011 18:06:12 +0000 (20:06 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 19 Jul 2011 18:06:12 +0000 (20:06 +0200)
commitee10ea01e426978794af82de2c2786d53c7ee635
tree50591461003e362679573f47b21490a1f7e8416f
parentd8864570906fd6c79c7b4b7b8d92cc7cbf1f501b
parenteac954fffca6a7532c671791cb4bdc0c21cdb9d3
Merge remote branch 'origin/morphed/teleporter'