From: matthiaskrgr <matthias.krueger@famsik.de>
Date: Fri, 28 Dec 2012 22:33:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: before-library~435^2
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=3567abbd64d4cb5a0db5e434955c83a924635d6f;hp=3567abbd64d4cb5a0db5e434955c83a924635d6f

Merge remote-tracking branch 'upstream/master'
---