From: Samual <samual@xonotic.org>
Date: Tue, 20 Dec 2011 15:20:43 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~30^2~46^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e6b0e571a7ded99220e4d95383434cbe6274bab2;p=xonotic%2Fxonotic.git

Merge remote branch 'origin/master' into samual/updatecommands
---

e6b0e571a7ded99220e4d95383434cbe6274bab2