From: Mario <zacjardine@y7mail.com>
Date: Sat, 2 Dec 2017 02:01:45 +0000 (+0000)
Subject: Merge branch 'Lyberta/NoalignFix' into 'master'
X-Git-Tag: xonotic-v0.8.5~2416
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=65493c17d47c0d5ece5e28a999a0162c5b070acb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/NoalignFix' into 'master'

Fixed noalign handling in random items and overkill.

See merge request xonotic/xonotic-data.pk3dir!509
---

65493c17d47c0d5ece5e28a999a0162c5b070acb