From: Mario <mario.mario@y7mail.com>
Date: Fri, 25 Jan 2013 11:21:58 +0000 (+1100)
Subject: Merge branch 'master' into mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~569
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=14e5e00667e8cbed3cbbb7c77f4603546ebe6c4b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mario/monsters
---

14e5e00667e8cbed3cbbb7c77f4603546ebe6c4b