From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Sat, 13 Jul 2013 09:17:46 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/lightspeed
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8866edaa52a16100ceab93263ed3936b5f5f0734;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into matthiaskrgr/lightspeed

Conflicts:
	maps/lightspeed.map.options
---

8866edaa52a16100ceab93263ed3936b5f5f0734