From: Mario <mario.mario@y7mail.com>
Date: Wed, 8 May 2013 02:07:59 +0000 (+1000)
Subject: Merge branch 'master' into Mario/rainbow_crosshair
X-Git-Tag: xonotic-v0.7.0~53^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f060ee04a520b3692340198b22fa6184181c827;p=xonotic%2Fxonotic-data.pk3dir.git

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

0f060ee04a520b3692340198b22fa6184181c827