From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 22 May 2012 12:35:05 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into tzork/csqc-items
X-Git-Tag: xonotic-v0.7.0~312^2~36
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=f2756ec48ef7d5c2edebc9bd4885cc753060b2e6

Merge remote branch 'origin/master' into tzork/csqc-items
---

f2756ec48ef7d5c2edebc9bd4885cc753060b2e6