Merge remote branch 'origin/samual/waypointsprite_edgeoffset'
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 12 Jul 2011 15:24:41 +0000 (17:24 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 12 Jul 2011 15:24:41 +0000 (17:24 +0200)

Trivial merge