From: merlijn <mhofstra@gmail.com>
Date: Wed, 11 May 2011 04:52:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/diabolik/playermelee'
X-Git-Tag: xonotic-v0.5.0~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=27956a44daabcc6fce081a07151b910d8ce3184c;p=xonotic%2Fmediasource.git

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

27956a44daabcc6fce081a07151b910d8ce3184c