Merge branch 'divVerent/xoylent-sane-options'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 25 Jul 2011 05:37:57 +0000 (07:37 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 25 Jul 2011 05:37:57 +0000 (07:37 +0200)

Trivial merge