From: mand1nga <mand1nga@xonotic.org>
Date: Thu, 21 Apr 2011 23:25:45 +0000 (-0300)
Subject: Merge remote branch 'origin/samual/remove_defaultsamual_config'
X-Git-Tag: xonotic-v0.5.0~264^2~28^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=69e0872e58d04b304ebb23900724f5767d8b41cc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/samual/remove_defaultsamual_config'
---

69e0872e58d04b304ebb23900724f5767d8b41cc