From: Rudolf Polzer Date: Mon, 25 Jul 2011 16:51:54 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/terencehill/freezetag_health_effect' X-Git-Tag: xonotic-v0.5.0~148^2~44 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d258838fcd6a9ad14f1a3f33eb743947befd8aaf;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/terencehill/freezetag_health_effect' --- d258838fcd6a9ad14f1a3f33eb743947befd8aaf