From: merlijn <mhofstra@gmail.com>
Date: Mon, 23 May 2011 19:29:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/diabolik/newanims'
X-Git-Tag: xonotic-v0.5.0~220^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=20668ea080d4edafd7d111f52162a7429cb5a57c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/diabolik/newanims'
---

20668ea080d4edafd7d111f52162a7429cb5a57c