From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Thu, 19 May 2011 19:43:28 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into diabolik/newanims
X-Git-Tag: xonotic-v0.5.0~220^2~4^2~1
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=a877e74fef5f247800fbb78086dc51e802b722ba;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into diabolik/newanims
---

a877e74fef5f247800fbb78086dc51e802b722ba