From: nifrek <nifrek@gmail.com>
Date: Tue, 20 Dec 2011 05:05:50 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into nifrek/duckanims
X-Git-Tag: xonotic-v0.6.0~188^2~27^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=74511aee30c0470380c6f99a472028465c3caf80;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into nifrek/duckanims
---

74511aee30c0470380c6f99a472028465c3caf80