From: Mario Date: Sat, 22 Nov 2014 06:48:42 +0000 (+1100) Subject: Merge branch 'master' into terencehill/verbose_notification_fix X-Git-Tag: xonotic-v0.8.0~143^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6dbd388cb15fe8a3a006292b7332086347250039;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/verbose_notification_fix --- 6dbd388cb15fe8a3a006292b7332086347250039