From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 14 Dec 2010 06:54:47 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/no_kill_notify'
X-Git-Tag: xonotic-v0.1.0preview~34
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=40305578291c1b0c459e90645ea99eb873b1bd1e;p=xonotic%2Fxonotic-data.pk3dir.git

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

40305578291c1b0c459e90645ea99eb873b1bd1e