From: merlijn <mhofstra@gmail.com>
Date: Sat, 1 Sep 2012 18:35:53 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/ablu/invicible_fix'
X-Git-Tag: xonotic-v0.7.0~255
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1d363de3b0b14e64a0413eab582cac6712aac80e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/ablu/invicible_fix'
---

1d363de3b0b14e64a0413eab582cac6712aac80e