From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 26 Nov 2011 00:17:16 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/shotgun_cannon
X-Git-Tag: xonotic-v0.8.2~10^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=174a829d2adc937ed7b48418c4f13eb95bc95669;p=xonotic%2Fmediasource.git

Merge branch 'master' into mirceakitsune/shotgun_cannon
---

174a829d2adc937ed7b48418c4f13eb95bc95669