From: Samual <samual@decrux.(none)>
Date: Fri, 1 Jun 2012 21:01:48 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
X-Git-Tag: xonotic-v0.8.0~152^2~408^2~78
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b7c49465049281c2d910b0f3b73a7fc1b7bd844e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
---

b7c49465049281c2d910b0f3b73a7fc1b7bd844e