From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Fri, 23 Jul 2010 23:04:38 +0000 (+0300)
Subject: Merge remote branch 'origin/master' into fruitiex/newpanelhud_stable
X-Git-Tag: xonotic-v0.1.0preview~400^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a5f1a00835fb892604248d4de5c4664d8d359928;p=xonotic%2Fxonotic-data.pk3dir.git

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

a5f1a00835fb892604248d4de5c4664d8d359928