From: Mario <mario.mario@y7mail.com>
Date: Fri, 25 Jan 2013 12:02:31 +0000 (+1100)
Subject: Merge commit 'd8d184e7c633d17f6a4468627b690bdbbae62206' into mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~568
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5cc089c7dd5cee553f3e76114425dd0ea9b67e6f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit 'd8d184e7c633d17f6a4468627b690bdbbae62206' into mario/monsters
---

5cc089c7dd5cee553f3e76114425dd0ea9b67e6f