From: terencehill <piuntn@gmail.com>
Date: Sun, 14 Dec 2014 22:42:07 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/start_ammo
X-Git-Tag: xonotic-v0.8.0~80^2~1
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=90c787a8242a7876e34940fe6d76d1395ea54389

Merge branch 'master' into terencehill/start_ammo
---

90c787a8242a7876e34940fe6d76d1395ea54389