From: Mario <mario.mario@y7mail.com>
Date: Tue, 1 Oct 2013 16:15:26 +0000 (-0700)
Subject: Merge branch 'master' into Mario/notifications
X-Git-Tag: xonotic-v0.8.0~56^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cfbae89787699ef956fd93f7d019da9696a09fa5;p=xonotic%2Fxonotic-data.pk3dir.git

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

cfbae89787699ef956fd93f7d019da9696a09fa5