Merge remote-tracking branch 'origin/master' into Mario/domination_waypoint_fix
authorSamual Lenks <samual@xonotic.org>
Mon, 29 Apr 2013 01:20:03 +0000 (21:20 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 29 Apr 2013 01:20:03 +0000 (21:20 -0400)

Trivial merge