From: Rudolf Polzer Date: Wed, 12 Jun 2013 11:53:50 +0000 (+0200) Subject: Merge branch 'master' into divVerent/simplified-sound-sliders X-Git-Tag: xonotic-v0.8.0~387^2~5 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=f7ee0cfda982d5fdc86bcdd686683db7cc699dc9 Merge branch 'master' into divVerent/simplified-sound-sliders --- f7ee0cfda982d5fdc86bcdd686683db7cc699dc9