From: Samual <samual@xonotic.org>
Date: Fri, 19 Aug 2011 02:31:34 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into fruitiex/animations
X-Git-Tag: xonotic-v0.6.0~40^2~76^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6549351d5a5f2307e603f69f8f23528d6a8baeb3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into fruitiex/animations
---

6549351d5a5f2307e603f69f8f23528d6a8baeb3