From: Dale Weiler <killfieldengine@gmail.com>
Date: Sat, 30 Nov 2013 18:14:04 +0000 (-0500)
Subject: Merge branch 'master' into cooking
X-Git-Tag: xonotic-v0.8.0~42
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2024b3bd7179b3b5a3033c9f485e9fa88e3086dc;p=xonotic%2Fgmqcc.git

Merge branch 'master' into cooking
---

2024b3bd7179b3b5a3033c9f485e9fa88e3086dc