From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 16 Dec 2010 20:53:17 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/panelhud'
X-Git-Tag: xonotic-v0.1.0preview~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f45f2df96df4e329a6b0b8343e53b750f9f632b0;p=xonotic%2Fxonotic-data.pk3dir.git

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

f45f2df96df4e329a6b0b8343e53b750f9f632b0