From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 19 Jan 2012 18:22:58 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/opera-by-morphed
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7de789f4d08b933b19d7dcc9752ec7cb37ecfe30;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into divVerent/opera-by-morphed
---

7de789f4d08b933b19d7dcc9752ec7cb37ecfe30