From: Jakob MG <jakob_mg@hotmail.com>
Date: Thu, 23 Aug 2012 18:17:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/mrbougo/killspree_bugfix'
X-Git-Tag: xonotic-v0.7.0~271
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dbcdd58814a7281aef637c8c07a02242331c4c86;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/mrbougo/killspree_bugfix'
---

dbcdd58814a7281aef637c8c07a02242331c4c86