From: Samual <samual@xonotic.org>
Date: Wed, 30 Mar 2011 07:54:12 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into sev/hudlayout
X-Git-Tag: xonotic-v0.5.0~305^2~14^2~1^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f60ddc18058431fe6cc05c85f90a0ba2c2e3e714;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into sev/hudlayout
---

f60ddc18058431fe6cc05c85f90a0ba2c2e3e714