From: Samual Lenks Date: Wed, 10 Jul 2013 06:28:33 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into samual/weapons X-Git-Tag: xonotic-v0.8.0~152^2~334 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=936363b20ad37d0f0e3bba07451219104652f1d5;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into samual/weapons --- 936363b20ad37d0f0e3bba07451219104652f1d5