From: Mario <zacjardine@y7mail.com>
Date: Sat, 11 Jul 2015 14:03:11 +0000 (+1000)
Subject: Merge branch 'amade/finalrage'
X-Git-Tag: xonotic-v0.8.1~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=38ea434e28386a69f7c9dad4830c22b1d41ae11f;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'amade/finalrage'
---

38ea434e28386a69f7c9dad4830c22b1d41ae11f