From: Dale Weiler <weilercdale@gmail.com>
Date: Wed, 10 Dec 2014 07:43:42 +0000 (-0500)
Subject: Merge branch 'cooking'
X-Git-Tag: xonotic-v0.8.1~9
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=ac8c7d730a7d0728facbdddea984a631037055aa

Merge branch 'cooking'

Conflicts:
	test.c
---

ac8c7d730a7d0728facbdddea984a631037055aa