From: Samual Lenks Date: Sun, 5 Jan 2014 03:36:30 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/master' into samual/weapons X-Git-Tag: xonotic-v0.8.0~152^2~137 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9e9ae52d6c468d5bbd43df53e54fc8d6c7276175;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into samual/weapons --- 9e9ae52d6c468d5bbd43df53e54fc8d6c7276175