From: terencehill <piuntn@gmail.com>
Date: Wed, 2 Sep 2015 17:26:30 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/slider_anim_improvements
X-Git-Tag: xonotic-v0.8.2~1890^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=688276421e89bb47394a765b2b242f81da1d4228;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/slider_anim_improvements
---

688276421e89bb47394a765b2b242f81da1d4228