From: cbrutail <ruszkai.akos@gmail.com>
Date: Tue, 3 Jan 2012 23:46:24 +0000 (+0100)
Subject: Merge branch 'cbrutail/reorganise_sounds1' into cbrutail/darkzone
X-Git-Tag: xonotic-v0.6.0~5^2~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ca4082a9b7015571fc18f2a6b71a3aac45647f48;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'cbrutail/reorganise_sounds1' into cbrutail/darkzone
---

ca4082a9b7015571fc18f2a6b71a3aac45647f48