From: Mario <mario.mario@y7mail.com>
Date: Tue, 30 Apr 2013 19:52:20 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~255
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8360336fa2725c644dc19cbceb9eaad56f3da9cc;p=xonotic%2Fxonotic-data.pk3dir.git

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

8360336fa2725c644dc19cbceb9eaad56f3da9cc