Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

diff --combined qcsrc/Makefile
index 3983966c48c327324331064c145c5da0c6e7f38b,5d079dcb05d7d62c96810b82204005d3a1f9543e..3e98265a9521945ec5049ac54d552d2d2dc62e40
--- 1/qcsrc/Makefile
--- 2/qcsrc/Makefile
+++ b/qcsrc/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  SCM := $(shell if [ -d .svn ]; then echo svn; elif [ -d ../.git ]; then echo git; fi)
  PERL ?= perl
  QCCFLAGS_WATERMARK ?= -DWATERMARK='"$(shell git describe)"' -DCVAR_POPCON=1
- QCC ?= fteqcc
+ QCC ?= gmqcc
  
  VERSION_MESSAGE = $(shell cd server && $(QCC) --version --help)
  ifneq (,$(findstring GMQCC,$(VERSION_MESSAGE)))
@@@ -33,7 -33,6 +33,7 @@@ QCCFLAGS ?= 
        -floop-labels \
        -funtyped-nil \
        -fno-permissive \
 +      -fvariadic-args \
        $(QCCFLAGS_EXTRA) $(QCCFLAGS_WATERMARK)
  else
  # this. is. fteqccccccccccccccccccc!