From: Dale Weiler <killfieldengine@gmail.com>
Date: Thu, 6 Jun 2013 06:20:58 +0000 (+0000)
Subject: Merge branch 'cooking'
X-Git-Tag: v0.3.0~151
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0eab97283f30db40344105a699440d7b5fbd2f96;p=xonotic%2Fgmqcc.git

Merge branch 'cooking'

Conflicts:
	.gitignore
---

0eab97283f30db40344105a699440d7b5fbd2f96