From: FruitieX <fruitiex@gmail.com>
Date: Fri, 24 Dec 2010 01:00:53 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into fruitiex/panelhud
X-Git-Tag: xonotic-v0.5.0~330^2~14^2~4^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ae38c94c9cff818defd70bc2cca258900655e1ef;p=xonotic%2Fxonotic-data.pk3dir.git

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

ae38c94c9cff818defd70bc2cca258900655e1ef