From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 13 Aug 2012 07:11:44 +0000 (+0200)
Subject: Merge commit '2edf2d628ab52514ab531976ee8b06479e56ace7'
X-Git-Tag: xonotic-v0.7.0~290^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=69bc67603b84c0febbb98d5fcfad7d94e245edbc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit '2edf2d628ab52514ab531976ee8b06479e56ace7'
---

69bc67603b84c0febbb98d5fcfad7d94e245edbc