From: Mario <mario.mario@y7mail.com>
Date: Mon, 27 Jan 2014 06:14:00 +0000 (+1100)
Subject: Merge branch 'master' into Mario/showspecs
X-Git-Tag: xonotic-v0.8.2~750^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8e3b8efa99f2620f1665252ce41eeb87a1483e32;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/showspecs
---

8e3b8efa99f2620f1665252ce41eeb87a1483e32