From: terencehill <piuntn@gmail.com>
Date: Fri, 27 Apr 2012 21:50:44 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/no_damagedbycontents_when_gibbed
X-Git-Tag: xonotic-v0.7.0~268^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=55d3273e61152efe4244561d71c313512c20c20d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/no_damagedbycontents_when_gibbed
---

55d3273e61152efe4244561d71c313512c20c20d