From: Mario <zacjardine@y7mail.com>
Date: Sat, 24 Jan 2015 01:55:46 +0000 (+1100)
Subject: Merge branch 'Mario/wep_settemp_fix'
X-Git-Tag: xonotic-v0.8.1~148
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2468dc625ea3dd08349f1ba6ea999992ad8ccd27;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/wep_settemp_fix'
---

2468dc625ea3dd08349f1ba6ea999992ad8ccd27