From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Sun, 15 Aug 2010 08:45:01 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~361
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f536d182b06173bac130d0e77dfcf25833641504;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into fruitiex/newpanelhud
---

f536d182b06173bac130d0e77dfcf25833641504