From: Mario <zacjardine@y7mail.com>
Date: Sun, 14 Dec 2014 23:49:30 +0000 (+0000)
Subject: Merge branch 'terencehill/start_ammo' into 'master'
X-Git-Tag: xonotic-v0.8.0~80
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5e5fb92433849ce367241c71e11b28420452e3cf;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/start_ammo' into 'master'

Terencehill/start ammo

Fixes for a few issues

See merge request !53
---

5e5fb92433849ce367241c71e11b28420452e3cf