From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 11 Jan 2015 14:58:45 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/mrbougo/clonefixes'
X-Git-Tag: xonotic-v0.8.0~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b0a06888ff894f9d334f6277b996f98ae8a665a0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/mrbougo/clonefixes'
---

b0a06888ff894f9d334f6277b996f98ae8a665a0