From: nyov <nyov@nexnode.net>
Date: Tue, 25 Nov 2014 08:31:16 +0000 (+0000)
Subject: Merge branch 'master' into samual/combined_updates
X-Git-Tag: xonotic-v0.8.0~139^2~1^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d9b5f3d1a9c73003eb046909ffb9832d46505ed7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into samual/combined_updates
---

d9b5f3d1a9c73003eb046909ffb9832d46505ed7