From: Samual Lenks Date: Mon, 29 Apr 2013 01:20:03 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into Mario/domination_waypoint_fix X-Git-Tag: xonotic-v0.7.0~65^2 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=0ee28e07a9b549802219bea01852416e7d622e60;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into Mario/domination_waypoint_fix --- 0ee28e07a9b549802219bea01852416e7d622e60