From: nifrek <nifrek@gmail.com>
Date: Mon, 20 Jun 2011 21:11:42 +0000 (-0400)
Subject: Merge branch 'master' into nifrek/longjumpanim
X-Git-Tag: xonotic-v0.5.0~199^2~13
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=d4ef2d3a8fb9f2710fb2038ed7cb82725f9c9d27;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into nifrek/longjumpanim
---

d4ef2d3a8fb9f2710fb2038ed7cb82725f9c9d27