From: merlijn <mhofstra@gmail.com>
Date: Tue, 10 May 2011 19:12:23 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/diabolik/playermelee'
X-Git-Tag: xonotic-v0.5.0~109^2~17^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e2daf8d138855a357293af335c1406ac2f808870;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/diabolik/playermelee'
---

e2daf8d138855a357293af335c1406ac2f808870