Merge remote branch 'origin/mand1nga/waypoints_space-elevator'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 4 Dec 2010 15:27:20 +0000 (16:27 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 4 Dec 2010 15:27:20 +0000 (16:27 +0100)

Trivial merge