From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Mon, 23 May 2011 18:59:05 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into diabolik/newanims
X-Git-Tag: xonotic-v0.5.0~220^2~4^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cdbf4d465dcd20a9ce7e1232671f24dc9d788459;p=xonotic%2Fxonotic-data.pk3dir.git

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

cdbf4d465dcd20a9ce7e1232671f24dc9d788459