From: Dale Weiler <killfieldengine@gmail.com>
Date: Sun, 2 Jun 2013 08:38:47 +0000 (-0700)
Subject: Merge pull request #112 from matthiaskrgr/master
X-Git-Tag: xonotic-v0.7.0^0
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=100eaf913700836457bf17e8f487744dedb84e44;hp=-c

Merge pull request #112 from matthiaskrgr/master

 mmmeeerging eeeet
---

100eaf913700836457bf17e8f487744dedb84e44