Merge branch 'master' into sev/xolonium

Conflicts:
	data/font-xolonium.pk3dir/font-xolonium.cfg

diff --cc data/font-xolonium.pk3dir/font-xolonium.cfg
index 2b6e30aa504b7988c8599f86dd7a370a42a42b69,023b64ea0078b34d5c5ddb7c6f646fe38c322a7a..f529defdb67f4cc75e5b9327f017885b8d13f00e
--- 1/data/font-xolonium.pk3dir/font-xolonium.cfg
--- 2/data/font-xolonium.pk3dir/font-xolonium.cfg
+++ b/data/font-xolonium.pk3dir/font-xolonium.cfg
@@@ -1,5 -1,6 +1,6 @@@
  // must be loaded AFTER config.cfg
 -loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize
+ set menu_font_cfg font-xolonium.cfg
 +loadfont console fonts/unifont-5.1.20080907,fonts/xolonium-regular.otf,gfx/vera-sans $con_textsize
  loadfont notify fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans $con_notifysize
  loadfont chat fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans $con_chatsize
  loadfont centerprint fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 9