From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Tue, 2 Jul 2013 20:20:21 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/unsealedtrial2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1fda6075dba06528a006acc592302f8ee555aceb;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into matthiaskrgr/unsealedtrial2
---

1fda6075dba06528a006acc592302f8ee555aceb