From: Samual <samual@xonotic.org>
Date: Tue, 31 May 2011 23:51:59 +0000 (-0400)
Subject: Merge remote branch 'origin/div0-stable' into samual/movetype_spectator
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c79e526f69a2c59e7602b0afa00453a857daa4ec;p=xonotic%2Fdarkplaces.git

Merge remote branch 'origin/div0-stable' into samual/movetype_spectator
---

c79e526f69a2c59e7602b0afa00453a857daa4ec