From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 28 Dec 2010 13:07:31 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/xpm'
X-Git-Tag: xonotic-v0.5.0~330^2~14^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=600222ffd7b37780d4c94a448150977c9750ef5c;p=xonotic%2Fxonotic-data.pk3dir.git

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

600222ffd7b37780d4c94a448150977c9750ef5c