From: Severin Meyer Date: Sun, 2 Aug 2015 09:40:58 +0000 (+0200) Subject: Merge branch 'master' into sev/luma_revisions X-Git-Tag: xonotic-v0.8.1~28^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=98e1375c9938f3d86d6f8e28f44cd6af74d2fc0e;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into sev/luma_revisions --- 98e1375c9938f3d86d6f8e28f44cd6af74d2fc0e