From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 25 Jul 2011 05:37:57 +0000 (+0200)
Subject: Merge branch 'divVerent/xoylent-sane-options'
X-Git-Tag: xonotic-v0.5.0~93
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=76984288e76969c9243f4988d91f6044cb95fd61;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'divVerent/xoylent-sane-options'
---

76984288e76969c9243f4988d91f6044cb95fd61