From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 8 Jul 2013 09:56:30 +0000 (+0200)
Subject: Merge commit '145caec5a836be05bfd091f175605bed237516e3'
X-Git-Tag: xonotic-v0.8.0~41
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eda70ff01ada5a6f2510b2e0720ece7ccbab1adf;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge commit '145caec5a836be05bfd091f175605bed237516e3'
---

eda70ff01ada5a6f2510b2e0720ece7ccbab1adf