From: Matthias Krüger Date: Mon, 19 Aug 2013 22:06:01 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' into master_PKGBUILD X-Git-Tag: 0.3.0^2 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=701363347fa3f231ed8b973503935d596aae57eb Merge remote-tracking branch 'upstream/master' into master_PKGBUILD --- 701363347fa3f231ed8b973503935d596aae57eb