From: Dale Weiler <weilercdale@gmail.com>
Date: Wed, 14 May 2014 03:22:25 +0000 (-0400)
Subject: Merge branch 'master' into cooking
X-Git-Tag: xonotic-v0.8.1~9^2~34
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7024ebfe7ff199e45ef9b6bfd627cb757d571f99;p=xonotic%2Fgmqcc.git

Merge branch 'master' into cooking
---

7024ebfe7ff199e45ef9b6bfd627cb757d571f99