From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Fri, 20 Sep 2013 14:22:40 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/stormkeep_barrel_readd
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8eb563e6d63f2aaaadbd2cbc17e2dac41a470f41;p=xonotic%2Fxonotic-maps.pk3dir.git

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

8eb563e6d63f2aaaadbd2cbc17e2dac41a470f41